Inuyasha
fa187c5ae7
Merge branch 'unslot-music' into 'master'
...
Hardcoded music name switches
Like I said earlier, it's better if all the hardcoded music switches in 2.2 start with an underscore so that it's harder to accidentally overwrite them.
Should be accepted when music.dta is updated.
See merge request !17
2016-10-23 06:46:33 -04:00
Inuyasha
9d5e0b314b
Autoload music_new.dta if it exists
...
Same no non-music lump requirement as music.dta, and is ignored with no error if music_new.dta doesn't exist
(should hopefully make playing around with music easier)
2016-10-23 03:44:51 -07:00
Alam Ed Arias
c3690092e1
Merge branch 'public_next' into master
2016-08-07 23:29:01 -04:00
Monster Iestyn
4c4f124611
Detect if -warp's parm is actually a valid map name (MAPxx or plain number), and print an "invalid map name" message if not
2016-07-28 16:07:26 +01:00
Alam Ed Arias
032313260a
Merge branch 'public_next' into master
2016-05-20 17:58:57 -04:00
Inuyasha
f07585191b
copyright dates/statements updated and such
...
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
Alam Ed Arias
fbd9cb73c3
Merge branch 'public_next' into private
2016-04-27 16:54:37 -04:00
Inuyasha
5aea82ec91
Some drawing code cleanup
...
Fixed mashing buttons during fades causing crashes,
messed up behavior, record attack anywhere,
all the damn stupid bugs that it caused, basically
2016-04-06 18:01:01 -07:00
Inuyasha
50d3fe15b8
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
...
# Conflicts:
# src/d_main.c
# src/doomdef.h
2016-03-31 21:17:29 -07:00
Alam Ed Arias
a567ce8e8e
Merge branch 'master' into next
2016-03-25 16:40:13 -04:00
Monster Iestyn
5dd0e533b3
Removed unused "supdate" variable
2016-03-15 21:18:25 +00:00
Inuyasha
83e9eb6df4
patch.dta officially in use. Version number updated.
2016-03-09 18:30:11 -08:00
Yukita Mayako
ca7151f1c2
Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git into reduced_palette
...
Conflicts:
src/dehacked.c
2015-11-09 14:34:26 -05:00
wolfy852
1ed5407821
update stuff
2015-11-07 13:56:21 -06:00
Yukita Mayako
0af32ee2fa
Move garbage collection out of Lua hooks.
...
That's supposed to be run once a frame, not once per hook
per mobj per frame you moron. If you just run it seven
thousand times a frame, of course your framerate will drop.
2015-06-10 13:42:45 -04:00
JTE
c1bfde0027
Fixed WGL code "device mode" breaking.
...
The devil is in the details.
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9001 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 20:44:32 -05:00
JTE
092134ad0c
Title screen cheat "devmode".
...
Access the benefits of -debug, console devmode, and a complete gamedata.dat (all secrets unlocked) all in one go.
Moved "#if 0" and "#if 1" to "#ifdef DEVMODE" so the existance of this cheat and MD5 validation and all that can be toggled in one place too.
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8998 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 20:43:09 -05:00
Ronald Kinard
0909fce2e3
cmake: Configure source via cmake
...
silently fixing a bad malloc here too shhhhhhhhh
2015-01-28 18:03:41 -06:00
Alam Ed Arias
73b3287b19
SRB2 2.1.14 release
2015-01-01 14:50:31 -05:00
Alam Ed Arias
404b5f666c
SRB2 2.1.12 release
2014-11-11 19:55:07 -05:00
Alam Ed Arias
7cb77075d1
SRB2 2.1.11 release
2014-08-26 23:56:30 -04:00
Alam Ed Arias
d6c29e19ab
SRB2 2.1.10 release
2014-08-05 19:59:40 -04:00
Alam Ed Arias
c028c83235
SRB2 2.1.9 release
2014-08-03 23:49:33 -04:00
Alam Ed Arias
f03e591f64
change SDL into HAVE_SDL
2014-07-25 19:10:24 -04:00
Alam Ed Arias
02a3b0776c
SRB2 2.1.7 release
2014-04-14 01:14:58 -04:00
Sryder13
fc12fc7cd4
OpenGL Screen Fading Fix
...
Screen Wipes now work as they did in 2.0.x.
2014-03-31 23:47:12 +01:00
Alam Ed Arias
32de698f5e
SRB2 2.1.6 release
2014-03-24 22:17:59 -04:00
Alam Ed Arias
15bd266cac
SRB2 2.1.5 release
2014-03-23 12:00:29 -04:00
Alam Ed Arias
ed72bd8fa1
SRB2 2.1.4 release
2014-03-21 19:21:06 +00:00
Alam Ed Arias
2fed5d1270
SRB2 2.1.3 release
2014-03-18 13:56:54 -04:00
Alam Ed Arias
a03da73115
SRB2 2.1.2 release
2014-03-17 08:13:16 -04:00
Alam Ed Arias
3e0b5ef1cd
SRB2 2.1.1 release
2014-03-15 18:55:07 -04:00
Alam Ed Arias
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00