Jaime Passos
b8e91a50a5
OpenGL funny
2019-12-27 00:02:30 -03:00
Jaime Passos
252ac7516a
Merge branch 'renderswitch' of https://git.magicalgirl.moe/STJr/SRB2 into renderswitch
2019-12-26 23:53:03 -03:00
Jaime Passos
543f80510b
And the sound test
2019-12-26 23:52:42 -03:00
Jaime Passos
ed11e89fdc
Same deal, but for the level platter and save select screen
2019-12-26 23:49:31 -03:00
James R
02104402ed
Save the renderer
2019-12-26 18:44:02 -08:00
James R
8311380146
Merge branch 'time' into 'master'
...
haha log files
See merge request STJr/SRB2!567
2019-12-26 21:43:46 -05:00
Jaime Passos
6de7b7eb99
Handle character select screen correctly after a renderer switch
2019-12-26 23:39:40 -03:00
James R
c92378fab7
Lua CV_FindVar function
...
(cherry picked from commit b5746c231d17cd7b58c6b633e242d5ad26ad7017)
2019-12-26 18:30:34 -08:00
James R
c8e08ec617
Expose CV_FindVar
...
(cherry picked from commit 0e9d69d6a3759686ca8bb567817be650291ea0e1)
2019-12-26 18:30:34 -08:00
Jaime Passos
a5ef201e3f
PU_PATCH funny
2019-12-26 23:26:43 -03:00
James R
d57083264e
One more optimization
2019-12-26 18:23:01 -08:00
James R
bbed1a16ba
e
2019-12-26 18:20:48 -08:00
James R
e3d08831f2
Make cv_renderer CV_NOLUA instead of hidden!!!
2019-12-26 18:15:52 -08:00
James R
4100e43a9d
CV_NOLUA for when a cvar should not be changed via Lua
2019-12-26 18:15:19 -08:00
James R
43dab49e74
A system to encode flags in the command buffer
2019-12-26 18:12:10 -08:00
Jaime Passos
a88b0bffe7
Avoid possible overflows in the rotsprite arrays.
2019-12-26 21:49:36 -03:00
Jaime Passos
a187538157
Remove the min() and max() calls.
2019-12-26 21:36:35 -03:00
Jaime Passos
f65ac6feab
stuff
2019-12-26 21:27:30 -03:00
James R
0fd77ff5f4
Merge remote-tracking branch 'origin/master' into next
2019-12-26 15:35:53 -08:00
James R
0726e0b1ee
Merge branch 'rotsprite2' into 'next'
...
rollangle and SpriteInfo changes
See merge request STJr/SRB2!547
2019-12-26 18:32:37 -05:00
Zachary McAlpin
e4e233d4de
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
2019-12-26 17:29:54 -06:00
Jaime Passos
070adb4191
Merge remote-tracking branch 'origin/next' into rotsprite2
2019-12-26 20:27:29 -03:00
James R
bd472eb353
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
abdd904ef0
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
599477061a
Merge branch 'gametype-clownery' into 'next'
...
Custom gametypes
See merge request STJr/SRB2!566
2019-12-26 18:08:41 -05:00
Zachary McAlpin
90a5b0bfae
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
2019-12-26 16:59:47 -06:00
James R
2c93621d5c
P_PlayerHitsPlayer is too big for inline, and these other functions are getting there
2019-12-26 14:59:31 -08:00
Monster Iestyn
3bafa90b7a
Fix mixed declaration-and-code compiling error
2019-12-26 21:59:09 +00:00
Jaime Passos
b90236281c
Rename R_WorldSegTextured
2019-12-26 18:13:03 -03:00
Jaime Passos
96980749ac
Masked stuff
2019-12-26 17:39:18 -03:00
Jaime Passos
51e51dfa4c
I forgot a `static`
2019-12-26 17:20:17 -03:00
Jaime Passos
1ac4b608dc
Thick stuff. Hoping I didn't break anything.
2019-12-26 17:15:30 -03:00
MascaraSnake
29e78d161a
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
f342610413
Use startpos->z instead of startpos->options >> ZSHIFT in F_StartTitleScreen
2019-12-26 20:55:29 +01:00
MascaraSnake
b1a43c7c4a
Use mthing->z instead of mthing->options >> ZSHIFT in G_AddGhost
2019-12-26 20:54:06 +01:00
MascaraSnake
63b5ee0650
Merge branch 'kill-zshift' of git.magicalgirl.moe:STJr/SRB2 into kill-zshift
2019-12-26 20:50:48 +01:00
Alam Ed Arias
dc1f97e634
Merge branch 'next' into mobjthinker-refactoring
2019-12-26 14:50:35 -05:00
MascaraSnake
92ca7e9f24
Use mt->z instead of mt->options >> ZSHIFT in Command_Teleport_f
2019-12-26 20:48:52 +01:00
Alam Ed Arias
97b5d2449c
Merge branch 'next' into gametype-clownery
2019-12-26 14:48:04 -05:00
Alam Ed Arias
fbe937e547
Merge branch 'next' into kill-zshift
2019-12-26 14:45:18 -05:00
Alam Ed Arias
19379a0a68
Merge branch 'kill-zshift' of git.magicalgirl.moe:STJr/SRB2 into kill-zshift
2019-12-26 14:43:03 -05:00
Jaime Passos
c8f9896e2d
struct time
2019-12-26 16:25:04 -03:00
MascaraSnake
015f3a36d2
Make P_RespawnSpecials call P_SpawnMapThing instead of trying to do everything itself
2019-12-26 20:13:56 +01:00
Sally Cochenour
176b853b01
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
9b68e48923
Move all the thick/masked/splat stuff to the end of the file
2019-12-26 15:34:33 -03:00
Jaime Passos
08ab0664f5
ifdef this right so it works like before without the define
2019-12-26 15:27:16 -03:00
Monster Iestyn
5420f4d19c
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
5089b93e4c
Merge branch 'next' into kill-zshift
2019-12-26 12:49:04 -05:00
Alam Ed Arias
64792ab9fd
ISO C90 fixup
2019-12-26 12:44:47 -05:00
Alam Ed Arias
22a04b2845
Merge branch 'next' into lua-damage-hooks-hotfix
2019-12-26 12:41:02 -05:00