Commit Graph

9060 Commits

Author SHA1 Message Date
Jaime Passos 56e94182d5 P_SetupCamera funny 2019-12-27 02:07:13 -03:00
Jaime Passos 51404130af Respawn delay gametype rule 2019-12-27 01:44:27 -03:00
Jaime Passos 5ea43aa023 Fix sprite rotation crashes. 2019-12-27 00:37:40 -03:00
James R 855e61f59e Pop monitors properly so Metal doesn't destroy enemy team's monitors 2019-12-26 19:27:25 -08:00
Jaime Passos 96609e45ae OpenGL funny 2019-12-27 00:02:30 -03:00
Jaime Passos 2d3f45de0d Merge branch 'renderswitch' of https://git.magicalgirl.moe/STJr/SRB2 into renderswitch 2019-12-26 23:53:03 -03:00
Jaime Passos eca5be52b2 And the sound test 2019-12-26 23:52:42 -03:00
Jaime Passos 956905c8f4 Same deal, but for the level platter and save select screen 2019-12-26 23:49:31 -03:00
James R 76a1a80d71 Save the renderer 2019-12-26 18:44:02 -08:00
James R e19d0877e8 Merge branch 'time' into 'master'
haha log files

See merge request STJr/SRB2!567
2019-12-26 21:43:46 -05:00
Jaime Passos 644e41d90c Handle character select screen correctly after a renderer switch 2019-12-26 23:39:40 -03:00
James R 7df6a3090a Lua CV_FindVar function
(cherry picked from commit b5746c231d17cd7b58c6b633e242d5ad26ad7017)
2019-12-26 18:30:34 -08:00
James R e49d12b731 Expose CV_FindVar
(cherry picked from commit 0e9d69d6a3759686ca8bb567817be650291ea0e1)
2019-12-26 18:30:34 -08:00
Jaime Passos e617f35182 PU_PATCH funny 2019-12-26 23:26:43 -03:00
James R 4865a19057 One more optimization 2019-12-26 18:23:01 -08:00
James R 9673439628 e 2019-12-26 18:20:48 -08:00
James R 4959d52ae0 Make cv_renderer CV_NOLUA instead of hidden!!! 2019-12-26 18:15:52 -08:00
James R cb29a9dd0a CV_NOLUA for when a cvar should not be changed via Lua 2019-12-26 18:15:19 -08:00
James R f26bdf00fe A system to encode flags in the command buffer 2019-12-26 18:12:10 -08:00
Jaime Passos da1718f93c Avoid possible overflows in the rotsprite arrays. 2019-12-26 21:49:36 -03:00
Jaime Passos 4b653a0b12 Remove the min() and max() calls. 2019-12-26 21:36:35 -03:00
Jaime Passos 56fd29a42a stuff 2019-12-26 21:27:30 -03:00
James R 1dac3d174e Merge remote-tracking branch 'origin/master' into next 2019-12-26 15:35:53 -08:00
James R 5872e8d453 Merge branch 'rotsprite2' into 'next'
rollangle and SpriteInfo changes

See merge request STJr/SRB2!547
2019-12-26 18:32:37 -05:00
Jaime Passos c0390f5186 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
James R 414a066ec8 Merge branch 'turnmultiplier' into 'master'
Option to increase the turning speed

See merge request STJr/SRB2!553
2019-12-26 18:18:23 -05:00
James R aa9cc6e6f2 Merge branch 'char-damage-fix' into 'next'
Fix Amy and Fang being able to attack other players in MP Special Stages

See merge request STJr/SRB2!558
2019-12-26 18:18:10 -05:00
James R e6532b9bad Merge branch 'gametype-clownery' into 'next'
Custom gametypes

See merge request STJr/SRB2!566
2019-12-26 18:08:41 -05:00
James R dd1ca69f54 P_PlayerHitsPlayer is too big for inline, and these other functions are getting there 2019-12-26 14:59:31 -08:00
Monster Iestyn ca5a4d90e0 Fix mixed declaration-and-code compiling error 2019-12-26 21:59:09 +00:00
Jaime Passos 69b4efb579 Rename R_WorldSegTextured 2019-12-26 18:13:03 -03:00
Jaime Passos ad6cda7c53 Masked stuff 2019-12-26 17:39:18 -03:00
Jaime Passos 0ec800b266 I forgot a ``static`` 2019-12-26 17:20:17 -03:00
Jaime Passos 919864d0f3 Thick stuff. Hoping I didn't break anything. 2019-12-26 17:15:30 -03:00
MascaraSnake b24bcbab65 Merge branch 'mobjthinker-refactoring' into 'next'
Hack P_MobjThinker into little pieces

See merge request STJr/SRB2!574
2019-12-26 14:59:37 -05:00
MascaraSnake 2d90098b6a Use startpos->z instead of startpos->options >> ZSHIFT in F_StartTitleScreen 2019-12-26 20:55:29 +01:00
MascaraSnake 7ccb695fa1 Use mthing->z instead of mthing->options >> ZSHIFT in G_AddGhost 2019-12-26 20:54:06 +01:00
MascaraSnake 24e15387b3 Merge branch 'kill-zshift' of git.magicalgirl.moe:STJr/SRB2 into kill-zshift 2019-12-26 20:50:48 +01:00
Alam Ed Arias e823441e31 Merge branch 'next' into mobjthinker-refactoring 2019-12-26 14:50:35 -05:00
MascaraSnake f86c5f13ce Use mt->z instead of mt->options >> ZSHIFT in Command_Teleport_f 2019-12-26 20:48:52 +01:00
Alam Ed Arias 61a0197339 Merge branch 'next' into gametype-clownery 2019-12-26 14:48:04 -05:00
Alam Ed Arias 5a5d5a76d4 Merge branch 'next' into kill-zshift 2019-12-26 14:45:18 -05:00
Alam Ed Arias c0d6cd8599 Merge branch 'kill-zshift' of git.magicalgirl.moe:STJr/SRB2 into kill-zshift 2019-12-26 14:43:03 -05:00
Jaime Passos 5f1e3bab71 struct time 2019-12-26 16:25:04 -03:00
MascaraSnake 855f5da6c9 Make P_RespawnSpecials call P_SpawnMapThing instead of trying to do everything itself 2019-12-26 20:13:56 +01:00
Sally Cochenour a1d944fc4d Fix scoreadd not doing anything when modified by Lua
This does not change any vanilla behavior, as scoreadd is reset constantly on the ground anyway -- this simply makes the behavior modifiable for Lua scripts.
2019-12-26 14:02:02 -05:00
Jaime Passos 4e0a7030ca Move all the thick/masked/splat stuff to the end of the file 2019-12-26 15:34:33 -03:00
Jaime Passos e09838224e ifdef this right so it works like before without the define 2019-12-26 15:27:16 -03:00
Monster Iestyn 6314f5b00a Merge branch 'lua-damage-hooks-hotfix' into 'next'
Lua: ShouldDamage/MobjDamage/MobjDeath hotfix

See merge request STJr/SRB2!575
2019-12-26 13:05:06 -05:00
Alam Ed Arias e8431e168a Merge branch 'next' into kill-zshift 2019-12-26 12:49:04 -05:00