mazmazz
abf2da9e9b
Merge remote-tracking branch 'mazmazz-kart-public-gl/md3-vanilla-kart' into md3-vanilla-kart
2019-01-10 22:15:05 -05:00
mazmazz
4d5f7e78cd
Merge remote-tracking branch 'kart-public-gl/next' into md3-vanilla-kart
2019-01-10 22:08:37 -05:00
Sal
45a1508f0a
Merge branch 'fix-chat' into 'next'
...
Fix splitscreen being forced into oldchat
See merge request KartKrew/Kart-Public!25
2019-01-10 18:43:14 -05:00
Sal
d726185f8e
Merge branch 'music-credits' into 'next'
...
In-game music credits
See merge request KartKrew/Kart-Public!23
2019-01-10 18:42:44 -05:00
wolfy852
6c4decfef3
Don't check splitscreen in OLDCHAT
2019-01-10 13:52:58 -06:00
TehRealSalt
5b05eff41f
Merge branch 'next' into music-credits
2019-01-10 01:14:02 -05:00
Sal
41c32be673
Merge branch 'kmd2-fallback' into 'next'
...
KMD2 Fallback
See merge request KartKrew/Kart-Public!22
2019-01-10 01:04:04 -05:00
TehRealSalt
37e79ebfbd
Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way
2019-01-10 01:03:53 -05:00
TehRealSalt
9975497a68
Remove this, doesn't work
2019-01-10 00:35:11 -05:00
TehRealSalt
cff7d2795d
Expose S_ShowMusicCredit to Lua
2019-01-09 21:17:24 -05:00
TehRealSalt
d3a38a4375
Add disable for music credit showing on the change music linedef
2019-01-09 21:17:10 -05:00
TehRealSalt
2ccdd3e4b7
Fix Music toggle trying to play a non-existent song in Kart
2019-01-09 21:13:06 -05:00
TehRealSalt
ed36f5ac16
Accidental unselected change
2019-01-09 21:12:33 -05:00
TehRealSalt
565b8f87fb
Show song credits if joining mid-game
...
Dunno if this works or not yet!
2019-01-09 21:01:56 -05:00
TehRealSalt
de72403fb9
Add MUSICDEF lump for defining custom songs & replacing existing songs
...
Very rudimentary at the moment, but it's workable
2019-01-09 21:00:45 -05:00
wolfy852
dbb7267f22
Missed a few spots
2019-01-09 15:53:59 -06:00
wolfy852
90148f79eb
If kmd2.dat isn't found in srb2home, search the game's directory for it
2019-01-09 15:38:37 -06:00
TehRealSalt
72bc1b48f6
Merge branch 'next' into music-credits
2019-01-09 03:08:20 -05:00
Sal
0a34d4bafa
Merge branch 'kart-public-travis-deployer' into 'next'
...
Implement OSX and Debian installer building for Travis
See merge request KartKrew/Kart-Public!8
2019-01-09 01:42:44 -05:00
Sal
2f30625c82
Merge branch 'drift-spark-adjustment' into 'next'
...
Minimum speed to get drift sparks
See merge request KartKrew/Kart-Public!20
2019-01-09 01:18:30 -05:00
Sal
94ff7c33fd
Merge branch 'kart-public-appveyor-improvements' into 'next'
...
Add Windows installer building and 64-bit builds to AppVeyor
See merge request KartKrew/Kart-Public!7
2019-01-08 21:20:51 -05:00
TehRealSalt
5e8e08ad95
Misc level init fixes
2019-01-08 20:14:58 -05:00
Marco Z
7806c43ecf
Kart Public Next merge
2019-01-08 18:43:49 -05:00
Marco Z
20a117cfc7
Kart Public Next merge
2019-01-08 18:39:11 -05:00
Sal
e0f18f6d03
Merge branch 'gamepad-tweaks' into 'next'
...
Gamepad Improvements
See merge request KartKrew/Kart-Public!5
2019-01-08 18:08:00 -05:00
wolfy852
e528750444
Fix improperly resolved conflicts
2019-01-08 16:44:56 -06:00
wolfy852
ad01dcc5ac
Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks
...
# Conflicts:
# CMakeLists.txt
# appveyor.yml
# src/command.c
# src/command.h
# src/d_clisrv.c
# src/d_netcmd.c
# src/dehacked.c
# src/doomdef.h
# src/hu_stuff.c
# src/m_misc.c
2019-01-08 16:32:24 -06:00
Sal
78ac038864
Merge branch 'mobjscale-global' into 'next'
...
Add a global for mobjscale
See merge request KartKrew/Kart-Public!10
2019-01-08 17:00:34 -05:00
TehRealSalt
b713903208
Merge remote-tracking branch 'master' into next
2019-01-08 16:29:14 -05:00
Sal
7f8609d335
Merge branch 'merge-srb2' into 'next'
...
Merge SRB2 master & next (round 1)
See merge request KartKrew/Kart-Public!16
2019-01-08 15:56:41 -05:00
Sal
6916667c41
Merge branch 'animtimer-fix' into 'next'
...
Cast animtimer to int before negating
See merge request KartKrew/Kart-Public!17
2019-01-08 15:47:14 -05:00
Sal
82246f6c25
Merge branch 'makefile-develop' into 'master'
...
Compile flag for DEVELOP
See merge request KartKrew/Kart-Public!18
2019-01-08 15:45:04 -05:00
Digiku
3cd4b253b1
Update hw_md2.c -- Redundant AngleFixed operation when modifying anglef
2019-01-08 11:30:04 -05:00
Digiku
090ecdb6e5
Update hw_md2.c -- player->frameangle fix
2019-01-08 11:22:33 -05:00
mazmazz
6ec6622610
Merge remote-tracking branch 'kart-public-gl/animtimer-fix' into md3-vanilla-kart
2019-01-07 05:44:23 -05:00
mazmazz
d34e1fd4e9
Add floating point epsilons
2019-01-07 04:40:19 -05:00
mazmazz
05a1a7e24a
Dummy out nextframe lerping (unused in Kart)
2019-01-07 04:38:17 -05:00
mazmazz
8504b000bb
Fix blinking MD2 models
...
MD2 models are forced to load float frames, so mesh->indices is never loaded, so glDrawElements can't be used. Use glDrawArrays instead.
2019-01-07 04:34:19 -05:00
mazmazz
391d001929
Un-dummy md5 checks
2019-01-07 04:34:18 -05:00
mazmazz
cc3b57a96c
Compile fix -- remove (void)alpha from DoScreenWipe
2019-01-07 04:34:17 -05:00
Arthur
531d42c1bd
Eliminate some old GL functions so we don't slide back into bad habits!
2019-01-07 04:34:16 -05:00
Arthur
25ef570a81
Fix screen transitions
2019-01-07 04:33:28 -05:00
mazmazz
08579d9447
Buildbot fixes
2019-01-07 04:33:27 -05:00
mazmazz
62596bed38
Compile fixes -- specify GLubyte for pglColor4ubv
2019-01-07 04:33:25 -05:00
Arthur
9774ecbdfb
Removed gr_voodoocompatibility as even low-power mobile devices do not have this limitation
...
No longer using byte2float in DrawPolygon -- use the surface color data directly
Vertex Buffer Objects for non-interpolated model frames
Removed some old unused paletted texture stuff
2019-01-07 04:33:22 -05:00
Arthur
00792f8dab
Removed unused PF_Md2 flag
...
More OpenGL performance increase by making assumptions about client state
2019-01-07 04:33:20 -05:00
Arthur
cf6af71d33
boolean fix for VS
...
add GL_NORMALIZE
2019-01-07 04:30:54 -05:00
mazmazz
72c2b28328
Ignored fread fix
2019-01-07 04:30:53 -05:00
mazmazz
d5a0b2df4d
More mixed d&c fixes
2019-01-07 04:30:52 -05:00
mazmazz
78adb69481
byte -> char
2019-01-07 04:30:51 -05:00
