Alam Ed Arias
6655e92410
Merge branch 'master' into next
2016-02-26 01:56:27 -05:00
Alam Ed Arias
41f8b25c36
travis: add verbose and server-response to wget
2016-02-26 01:48:11 -05:00
Alam Ed Arias
9b55244dc3
travis: use SRB2-v2114-assets.7z
2016-02-26 01:39:08 -05:00
Alam Ed Arias
cb9542848b
Merge remote-tracking branch 'public/next' into next
2016-02-25 18:42:28 -05:00
Inuyasha
8b7e0347fd
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
...
# Conflicts:
# src/sdl/i_system.c
2016-02-25 15:41:13 -08:00
Alam Ed Arias
b3b5521e1b
Merge branch 'master' into next
2016-02-25 18:33:29 -05:00
Alam Ed Arias
8a369d969b
whitespace clean
2016-02-25 18:31:40 -05:00
Inuyasha
5108bb97f4
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-02-25 15:16:15 -08:00
Inuyasha
1e15ed2f7b
Merge branch 'i-hate-stupid-speedrun-tricks' into 'next'
...
Fix chain launching
Basically you're not allowed to launch off a chain the frame you touch it anymore.
Coincidentally the changes here allow you to actually use PF_*STASIS in a Lua script now and have it work as you'd expect it to (it lasts for a tic).
See merge request !49
2016-02-25 18:12:39 -05:00
Inuyasha
aa4414d706
Merge branch 'sdlmix-master' into 'master'
...
cpuaffinity/sdl_mixer changes
Hopefully this will alleviate SDL2 sound issues.
If not, hopefully this will give us info on what the hell is going on.
See merge request !51
2016-02-25 18:12:10 -05:00
Inuyasha
8cc6261c15
Merge branch 'monster-misc-2' into 'master'
...
Monster misc 2
Just some clean-up in doomdef.h, nothing important or majorly game-breaking really. It's all stuff that apparently hasn't been used by the game itself in many years by now.
...
inb4 I find something else obsolete to kill later and make monster misc branch no. 3
See merge request !52
2016-02-25 18:10:48 -05:00
Inuyasha
8cf74f5044
Merge branch 'mf_pain-fix' into 'next'
...
Fix dead MF_PAIN objects hurting the player
Makes MF_PAIN check for health before damaging the player. Fixes issue #12
See merge request !47
2016-02-25 18:10:08 -05:00
Inuyasha
6dda71bef7
I guess this is becoming the "try to make SDL_mixer work" branch
...
Move InitSubSystem calls into proper places,
don't use AUDIO_S16LSB (bad according to SDL_mixer docs)
Add error checking
2016-02-22 23:08:35 -08:00
Inuyasha
b258b9b503
remove cpuaffinity code from SDL
...
still exists in DD (while it exists) but no longer saves.
No reason whatsoever for affinity to be settable by the game itself.
2016-02-22 23:08:34 -08:00
Inuyasha
7c5adacc6f
Fixed chain launching
...
In the process, the stasis flags work like you'd expect them to.
You can now set them in Lua or code and they'll actually do something.
2016-02-14 12:28:03 -08:00
wolfy852
e43f21cdda
Fix dead MF_PAIN objects hurting the player
...
Fixes #12
2016-02-13 17:31:38 -06:00
Monster Iestyn
db18ad6b7f
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2.git into monster-misc-2
2016-02-09 19:54:49 +00:00
Monster Iestyn
5d1c8d2968
My cherry picking somehow lead to these functions being doubled ...whoops
2016-02-09 19:35:04 +00:00
Alam Ed Arias
6000b5c980
Merge branch 'master' into next
2016-02-09 14:13:50 -05:00
Sean Ryder
ddb5652ab6
Tabbing
2016-02-09 18:05:19 +00:00
Sryder13
6b8c438e58
Change a few colours.
2016-02-09 18:05:11 +00:00
Sryder13
31deecc51c
Colour Changing MD2s
...
I don't know how I can move my old branch over so I've just created a new one.
2016-02-09 18:04:59 +00:00
Monster Iestyn
700c9c2e70
Merge branch 'md2_colourchange' into 'master'
...
Colour Changing MD2s
What it says it is, I haven't touched it in quite a while, but I have checked and it seems to be working.
See merge request !30
2016-02-09 13:03:52 -05:00
Monster Iestyn
66175d87b8
removed unused macros from doomdef.h
2016-02-08 20:10:32 +00:00
Alam Ed Arias
985b9a11cc
Merge branch 'travis-ci' into 'master'
...
Travis-CI builds
Merge support to build SRB2 for Linux system via Travis-Ci
This will build SRB2 with GCC and Clang to make sure we do not break Linux/GNU builds
See merge request !41
2016-02-07 21:57:26 -05:00
Yukita Mayako
914c6c9d98
Whitespace cleanup.
2016-02-07 21:45:16 -05:00
Alam Ed Arias
2dc9a4b34a
Merge branch 'master' into next
2016-02-07 21:22:28 -05:00
Alam Ed Arias
6b626f1b27
build: cmake is messly
2016-02-07 20:53:27 -05:00
Alam Ed Arias
3ba827f33d
Merge branch 'master' into travis-ci
2016-02-07 00:39:25 -05:00
Alam Arias
f9d56f65a8
Merge pull request #47 from ProfessorKaos64/brewmaster
...
Update pkg to be fully compatible with Debian Jesse, add desktop file/artwork
2016-02-07 00:36:04 -05:00
mikeyd
865676d341
loose the revision, pkgs switched to native format
2016-02-06 22:46:52 -05:00
mikeyd
c8ae630dfe
Fix desktop file
2016-02-06 22:29:01 -05:00
mikeyd
1082ae6ba5
Missing append, <facepalm.jpg>
2016-02-06 22:17:14 -05:00
mikeyd
3ae9892064
missing install section for new desktop/png file
2016-02-06 22:08:32 -05:00
mikeyd
40dff2c123
missing space for "proper" Debian formatting
2016-02-06 22:00:59 -05:00
mikeyd
d213791054
Rename srb2 to srb2.desktop
2016-02-06 18:13:14 -05:00
mikeyd
7768ec821a
add missing dirs
2016-02-06 18:08:53 -05:00
mikeyd
5c1dff7974
Next attempt at install banner/desktop shortcut
2016-02-06 17:41:53 -05:00
ProfessorKaos64
4f59bf5303
add artwork for BPM
2016-02-06 17:36:21 -05:00
mikeyd
c8e7cffa1d
try install of banner image
2016-02-06 17:33:27 -05:00
mikeyd
b6203d0412
Create srb2
2016-02-06 17:26:09 -05:00
mikeyd
5d32ccffcf
fix pkgconfig path for Debian Jessie
2016-02-06 17:25:27 -05:00
Alam Ed Arias
f9d23370b6
debian: the data package should be native
2016-02-06 17:10:55 -05:00
Alam Ed Arias
5c09c31584
Debian: only just make srb2 depend on srb2-data (2.1.14-1))
2016-02-06 14:56:16 -05:00
Alam Ed Arias
5d5956b650
debian: depend on srb2-data 2.1.14, not 2.1.4
2016-02-06 14:42:02 -05:00
Alam Ed Arias
bac39b1bc0
debian: untested update for Debian packages
2016-02-06 12:31:44 -05:00
Alam Ed Arias
e9048aec48
travis: premake the cache folder
2016-02-05 23:22:06 -05:00
Alam Ed Arias
6d26a60cbe
travis: cache 7z SFX
2016-02-05 23:19:38 -05:00
Alam Ed Arias
7c1f1d9c8e
travis: compile with warnings as errors, skip absolute-value warnings
2016-02-05 22:54:50 -05:00
Alam Ed Arias
07fc74eaf5
clang: fixup a few clang warnings
2016-02-05 22:38:40 -05:00
