Commit graph

14505 commits

Author SHA1 Message Date
James R
61a4fe06d5 Merge branch 'bot-respawn-hook' into 'next'
BotRespawn hook

See merge request STJr/SRB2!804
2020-04-09 19:52:25 -04:00
James R
17082fafbd Merge branch 'gtr-replace' into 'next'
Separate PvP damage from ringslinger

See merge request STJr/SRB2!831
2020-04-09 19:51:52 -04:00
James R
0b91ef071f Merge branch 'sdlglcontext' into 'master'
Only initialise OpenGL if the user intends to load it (for real this time)

See merge request STJr/SRB2!796
2020-04-09 19:51:20 -04:00
James R
71f4433b98 Merge branch 'dye' into 'next'
Expose colorization to mappers and SOC

See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04:00
James R
ae3bf2498a Merge branch 'supergoldedit' into 'next'
Change SKINCOLOR_SUPERGOLD1-5

See merge request STJr/SRB2!805
2020-04-09 19:50:06 -04:00
James R
f68a361f6e Merge branch 'pk3-directory-start' into 'next'
Don't skip the first directory entry of PK3 if it's a file

See merge request STJr/SRB2!764
2020-04-09 19:49:44 -04:00
James R
7ff3e7f18b Merge branch 'lightmemedata' into 'next'
Cvars returned by CV_FindVar did not work with userdataType

See merge request STJr/SRB2!754
2020-04-09 19:48:39 -04:00
James R
dc37cdf2a6 Merge branch 'loop-patch' into 'next'
Let MUSICDEF set loop point

See merge request STJr/SRB2!762
2020-04-09 19:47:43 -04:00
James R
34318fbc98 Merge branch 'SF_NONIGHTSSUPER' into 'next'
Skin flag for disabling super colors in NiGHTS

See merge request STJr/SRB2!782
2020-04-09 19:47:20 -04:00
James R
2c539300d3 Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER 2020-04-09 16:47:52 -07:00
James R
483243353b Merge branch 'lua-hook-cleanup' into 'next'
Lua hook cleanup

See merge request STJr/SRB2!851
2020-04-09 19:40:09 -04:00
James R
cc6649f20e Merge branch 'fix-consbackpic' into 'master'
Fix console backpic

See merge request STJr/SRB2!850
2020-04-09 19:39:16 -04:00
James R
a2a4a4a321 Merge branch 'fixed2float-funcs' into 'master'
Turn FIXED_TO_FLOAT into a function

See merge request STJr/SRB2!869
2020-04-09 19:37:22 -04:00
Sally Cochenour
d0a6c43c89 Minor things 2020-04-09 02:52:41 -04:00
Hannu Hanhi
2ac33942a2 Chat drawing memory leak fix from SRB2 repo 2020-04-08 17:33:23 -04:00
wolfs
eb5f731845 Merge branch 'awful-mix' into 'awful-mix'
Fix lol xd compiler errors

See merge request SinnamonLat/Kart-Public!2
2020-04-08 17:04:06 -04:00
James R
9f1c616817 Fix lol xd compiler errors 2020-04-07 17:06:20 -07:00
Steel Titanium
2d8a924369 Fix error with travis 2020-04-07 19:48:39 -04:00
Steel Titanium
829e63364d Fix this mistake 2020-04-07 19:27:20 -04:00
Steel Titanium
eafa6a53a7 Fix even more build errors 2020-04-07 19:14:27 -04:00
Steel Titanium
f25235d1eb Fix some build errors 2020-04-07 19:07:39 -04:00
Steel Titanium
5e0eca9fe9 Support for http downloads 2020-04-07 18:22:29 -04:00
Wolfy
7444dd34ab Add PT_CLIENTCMD back to allowed packet types
Fixes unexpected CLIENTCMD prints
2020-04-07 07:09:51 -05:00
Wolfy
e95fbba181 Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into awful-mix 2020-04-07 06:41:54 -05:00
Wolfy
1d1b1514b4 Remove stupid dumbfuck #ifdefs
WHY THE FUCK DID THESE BREAK IT AAAAAAAAAAAAAAAAAAA
2020-04-07 05:24:38 -05:00
Wolfy
8fabcc1228 Fix unterminated #ifdef 2020-04-07 04:25:11 -05:00
Wolfy
d96d86dc5d Merge remote-tracking branch 'remotes/digiku/public-musicplus-lua' into awful-mix
Reimplements removed MusicPlus functions.

# Conflicts:
#	src/lua_baselib.c
#	src/lua_hook.h
#	src/lua_hooklib.c
#	src/lua_script.h
2020-04-07 03:41:26 -05:00
Wolfy
ffc232f970 Revert the removal of S_MusicExists 2020-04-07 02:56:45 -05:00
Sally Cochenour
fe376a388b Slight adjustments 2020-04-07 00:53:43 -04:00
Sally Cochenour
3f639b4f8a Rubberbanding! 2020-04-07 00:40:44 -04:00
Wolfy
6ea0492008 Potentially fix join passwords 2020-04-05 18:57:47 -05:00
Wolfy
e6d7af623a Revert "PT_CLIENTCMD test"
This reverts commit e2feca3dc7.
2020-04-05 17:18:22 -05:00
Wolfy
e2feca3dc7 PT_CLIENTCMD test 2020-04-05 17:01:40 -05:00
Wolfy
b7c1bf1c93 Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into awful-mix 2020-04-05 16:12:04 -05:00
Wolfy
2c54c32eb3 Fix packet type desync 2020-04-05 16:11:30 -05:00
Wolfy
86ac41bb4a Record attack only linedef exec 2020-04-05 22:37:42 +02:00
Latapostrophe
1051b115b4 Merge branch 'v1-backwards-thrown-spikeballs' into awful-mix 2020-04-05 22:31:07 +02:00
Latapostrophe
297104f12d Merge branch 'fix-double-bombs' into awful-mix 2020-04-05 22:30:43 +02:00
Wolfy
e9bbdb8cc3 Reimplement the MusicChange hook
why the fuck was this removed
2020-04-05 12:09:44 -05:00
Wolfy
e0fec734f2 Record attack only linedef exec 2020-04-05 14:12:12 +02:00
Latapostrophe
51b1430dd6 Merge branch 'v1-backwards-thrown-spikeballs' into awful-mix 2020-04-05 14:10:00 +02:00
Sally Cochenour
9495832106 Slow down backwards spikeballs (again) 2020-04-05 14:09:04 +02:00
Wolfy
e2aeabec1b Record attack only linedef exec 2020-04-05 07:03:49 -05:00
Latapostrophe
29781688e8 Merge branch 'v1-ignore-posthumous-ackret' into awful-mix 2020-04-05 11:23:49 +02:00
Latapostrophe
dc00dbdeee Merge branch 'ignore-posthumous-ackret' of git.magicalgirl.moe:KartKrew/Kart-Public into v1-ignore-posthumous-ackret 2020-04-05 11:23:29 +02:00
Sally Cochenour
dbb52e4aa5 Use bananas, orbinauts, jawz, mines, and ballhog
Yaaay

Bananas and mines could definitely be improved, but works for now
2020-04-05 02:14:40 -04:00
Sally Cochenour
6ecad2e73a Reduce steering code duplication 2020-04-05 02:13:39 -04:00
James R
77e01f61e6 Waypoint Riser: Require Object Special for discrimination by tag
So the default is to affect all waypoints in the sector.
2020-04-04 01:28:53 -07:00
James R
89a2f8ec8d Thing type 2002, MT_WAYPOINT_RISER - Raise tagged waypoints in sector to FOF sorted by height
Thing height refers to the index of FOF. FOF are sorted by top height, lowest
to highest. Set Object Flip to sort highest to lowest.

If the waypoint thing set Object Flip, it will be placed on the bottom of the
FOF. The sorting remains the same though.

Set Ambush to raise the waypoint to the same z position.
2020-04-04 01:20:38 -07:00
Sally Cochenour
b983031587 Yet more misc polish since I can't focus on orbis
- Massive improvements to object steering -- they do it more often and more strongly
- Steering towards hurtable players is now weighted on acceleration, and steering away from painful players is weighted on handling
- Bots now can get & use Thunder Shield
- Bots now know how to detontate Eggman Item explosions early
- Top speed gets a buff to make up for them losing lots of speed without drifting, weighted more heavily towards low acceleration characters
2020-04-04 01:42:56 -04:00