toasterbabe
ba04e982b2
Make the temperature gauge for added WADs start at zero, not however much the mainwads provided.
...
Also, mainwads now accounts for music_new, and that's added via DEVELOP instead of something we might forget to remove later.
2017-05-05 14:43:39 +01:00
toasterbabe
66f56bbba3
* Menu always updates for file load... by doing the refresh in the drawing function, eep. Oh well.
...
* M_StartMessages when file loading goes wrong! (Determined by CONS_Alerts of warning level CONS_WARNING and CONS_ERROR happening after W_LoadWadFile has been called.)
* Now actively tries to keep your place on the menu if files are deleted between calls to preparefilemenu().
* More enums! DIR_ (for if you want to try embed more metadata in the dirmenu strings) and REFRESHDIR_ (for refreshing the menu and handling warnings).
* Handle changing size menu between calls to opendir() better.
* Don't crash on draw/enter attempt if one of the dirmenu's is null.
* Moved the addons menu to OP_MainMenu instead of MainMenu for now so it can be tested in MP without needing to mess with several menus.
* Display the amount of space used for serverinfo_pak's fileneeded on the addons menu, both visually and with a percentage.
2017-05-03 22:36:08 +01:00
Monster Iestyn
3ff899858c
Merge branch 'master' into opengl-improvements
...
# Conflicts:
# src/doomdef.h
2017-04-19 14:53:50 +01:00
toasterbabe
eea7dc4224
Fixed titlemap wipe lasting too long/happening twice over
2017-04-18 17:46:26 -04:00
yellowtd
217f7ebd38
miru asked me for help and im a smelly toast
...
* Fix Crashes With Respect To Switching Between The Normal Title And Her Magic One
* Clean Up A Bit Of Code
2017-04-18 17:45:43 -04:00
yellowtd
7e43272932
begin titlemap
...
idk my bff jill
2017-04-18 17:23:23 -04:00
Monster Iestyn
93efb3084e
Merge branch 'mi-a-bit-of-cleanup' into 'master'
...
MI's unimportant code cleanup
Just removing a bunch of unused variables/function prototypes from the source code and similarly minor stuff, nothing here should change gameplay much (if at all).
See merge request !71
2017-04-17 14:43:50 -04:00
Monster Iestyn
731ee115a3
Merge branch 'public_next'
2017-03-13 18:25:26 +00:00
Monster Iestyn
6f2f244aef
Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now
...
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
2017-02-22 21:07:29 +00:00
ZTsukei
226e7ead59
DevEXE version 1.1.00: Added some MD5 checks, increased md2 triagle limit, temporarily disabled magnet
2017-02-20 20:08:24 -05:00
ZTsukei
559607dfe2
version num 1.0.04; Removed unneeded files from the md5 check
2017-02-17 19:39:10 -05:00
Sryder
68d439a783
Merge branch 'upstream/next' into zarrotsu_vanillamerge
...
# Conflicts:
# src/Makefile
# src/doomdef.h
# src/hardware/hw_main.c
# src/p_mobj.c
# src/p_user.c
# src/r_segs.c
# src/sdl/i_video.c
# src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Sryder
2d6c7959ed
Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge
...
# Conflicts:
# .gitignore
# libs/zlib/projects/visualc10/zlib.vcxproj
# src/Makefile
# src/am_map.c
# src/d_main.c
# src/dehacked.c
# src/doomdef.h
# src/g_game.c
# src/hardware/hw_main.c
# src/hardware/hw_md2.c
# src/info.c
# src/p_inter.c
# src/p_map.c
# src/p_mobj.c
# src/p_spec.c
# src/p_user.c
# src/r_bsp.c
# src/r_plane.c
# src/r_segs.c
# src/r_things.c
# src/s_sound.c
# src/s_sound.h
# src/sdl/Srb2SDL-vc10.vcxproj
# src/win32/Srb2win-vc10.vcxproj
# src/win32/Srb2win.ico
# src/y_inter.c
2017-02-17 20:03:10 +00:00
ZTsukei
b0b51f9a61
Some position code
2017-02-12 23:25:06 -05:00
ZTsukei
580f909c6c
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 17:19:58 -05:00
Monster Iestyn
dc249c6cd5
D_ModifierKeyResponder now checks for ev_console as a "key down" event
...
console window uses ev_keyup too so don't worry about turning off
2017-02-04 23:26:37 +00:00
Monster Iestyn
106e1aa8d5
Merge branch 'master' into opengl-improvements
2016-12-21 19:49:02 +00:00
ZTsukei
66c6b6885f
Updates done a while ago... Not 100% sure what they were. :x
2016-11-20 23:23:10 -05:00
Inuyasha
1ff498fcfd
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
...
# Conflicts:
# src/console.c
2016-11-10 16:20:03 -08:00
Monster Iestyn
795b3aa552
Call V_DoPostProcessor only in software mode (it cancels itself in OGL anyway)
2016-11-05 19:54:38 +00:00
Inuyasha
c277125fe7
modifier key status made globally accessible
...
now also properly handles L/R simultaneous presses
2016-11-02 15:23:22 -07:00
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
ZTsukei
82b0e9962e
Toaster's friction code???
2016-08-23 21:04:06 -04:00
ZTsukei
da7a513c9a
Some drift code, some control code
2016-08-21 17:55:37 -04:00
ZTsukei
3a3180ce05
Redid control names, some item code, start of drift shenanigans
2016-08-20 22:15:11 -04:00
ZTsukei
d631d0ef04
S_PLAY states, HUD stuff
2016-08-14 23:51:25 -04: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
ZTsukei
e4a970f894
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04: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
ZTsukei
fbdb98c8b1
Menu toggles. Doesn't work yet.
2016-02-27 11:11:14 -05:00
ZTsukei
ba18d968e5
Added vars to d_clisrv, renamed autoexec.cfg, added menu variables to d_netcmd.h, added powers to dehacked.c for LUA, and made sure things can actually compile correctly as-is (squished two errors).
2016-02-21 12:40:01 -05: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