mazmazz
|
a050ed956a
|
Fixed Addons Menu icons for search bar
|
2019-01-08 01:31:44 -05:00 |
|
mazmazz
|
47bd042a7e
|
Misssed alwaysfreelook defaults (first person)
|
2019-01-08 01:29:12 -05:00 |
|
mazmazz
|
d5de5e9f49
|
Fix player.dta SIGNA0 overwriting regular end sign frame
|
2019-01-08 00:19:42 -05:00 |
|
mazmazz
|
e02fd489a7
|
GCC 7 fallthru bypasses (-Werror-implicit-fallthrough)
|
2019-01-07 23:06:47 -05:00 |
|
mazmazz
|
8ea8bf2587
|
Chat arrow offsets
|
2019-01-07 22:34:48 -05:00 |
|
mazmazz
|
5066e340f4
|
Update SRB2-CHAT nickname colors to 2.2 skincolors
|
2019-01-07 22:26:39 -05:00 |
|
mazmazz
|
e403d1bacc
|
Correct addons menu back color
|
2019-01-07 21:58:42 -05:00 |
|
mazmazz
|
dfc427e81a
|
Dummy out SRB2-CHAT console colors
Pending translation to 2.2 palette indexes
|
2019-01-07 21:54:38 -05:00 |
|
mazmazz
|
411b1b4f54
|
Addons menu merge fixes
|
2019-01-07 21:45:41 -05:00 |
|
mazmazz
|
a775a63dfd
|
WIP hu_stuff merge fixes
|
2019-01-07 17:56:55 -05:00 |
|
mazmazz
|
875aee60a0
|
Menu merge fixes
|
2019-01-07 17:56:43 -05:00 |
|
mazmazz
|
b3f7b169b2
|
Merge errors for compile
|
2019-01-07 17:05:20 -05:00 |
|
Digiku
|
4f0be1b064
|
Update f_finale.c - Small credits update
|
2019-01-07 16:50:59 -05:00 |
|
mazmazz
|
7aa55f24f5
|
Resolve r_data.c colormap conflict
|
2019-01-07 15:29:37 -05:00 |
|
Nev3r
|
7d09149b04
|
Solved conflicts related to PK3s
Signed-off-by: Nev3r <apophycens@gmail.com>
|
2019-01-07 19:00:31 +01:00 |
|
Monster Iestyn
|
9effa134d2
|
resolve the conflict in p_spec.c
|
2019-01-07 17:02:05 +00:00 |
|
Monster Iestyn
|
96ad8dd81a
|
resolve conflict in r_main.c
|
2019-01-07 16:52:46 +00:00 |
|
Digiku
|
1c1331199d
|
Update f_finale.c - Remove Torgo's real name by request
|
2019-01-07 03:41:25 -05:00 |
|
mazmazz
|
015e7b9862
|
Resolve p_setup and d_netcmd conflicts (20190101 public merge)
|
2019-01-07 03:07:24 -05:00 |
|
mazmazz
|
e18eb69a0b
|
Resolved filesrch.c conflicts (20190101 public merge)
|
2019-01-07 02:54:26 -05:00 |
|
mazmazz
|
e9150b6645
|
Resolve m_menu.c conflicts (20190101 public merge)
|
2019-01-07 02:31:45 -05:00 |
|
Digiku
|
d5870e6f8a
|
Merge branch 'changecontrol-text-overflow-fix' into 'master'
Resolve buffer overflow crash when configuring System Menu and GIF controls
See merge request STJr/SRB2!445
|
2019-01-04 19:39:17 -05:00 |
|
Digiku
|
c97dc5d3c4
|
Increase M_ChangecontrolResponse message buffer by 25 chars
|
2019-01-04 19:38:36 -05:00 |
|
mazmazz
|
2e4c139551
|
DD Compile fixes
|
2019-01-02 06:48:06 -05:00 |
|
mazmazz
|
2bd794c006
|
Remove S_MusicExists lua
|
2019-01-02 06:26:18 -05:00 |
|
Steel Titanium
|
827461cc36
|
Support for per-map intermission music
|
2019-01-02 05:15:23 -05:00 |
|
mazmazz
|
e2e345988a
|
Add safe lua music functions
S_MusicExists
S_SetInternalMusicVolume
S_StopFadingMusic
S_FadeMusic
S_FadeOutStopMusic
|
2019-01-02 04:58:03 -05:00 |
|
mazmazz
|
1aacfee80c
|
Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core
|
2019-01-02 03:47:51 -05:00 |
|
mazmazz
|
109dd70a53
|
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
|
2019-01-02 02:15:16 -05:00 |
|
mazmazz
|
075f28b7c8
|
WIP 20190101 merge
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
|
2019-01-02 01:09:15 -05:00 |
|
Alam Ed Arias
|
819e4ef2ae
|
Merge branch 'master' into next
|
2019-01-01 23:00:39 -05:00 |
|
Digiku
|
393c64b8bc
|
Merge branch 'expanded-nmuslist' into 'next'
Expand NMUSList to include HUD changes
See merge request STJr/SRB2!388
|
2019-01-01 15:06:04 -05:00 |
|
Digiku
|
5278d1ca20
|
Merge branch 'caps-lock-consistency-fix' into 'master'
Update capslock state on window re-focus
See merge request STJr/SRB2!436
|
2019-01-01 15:05:20 -05:00 |
|
Digiku
|
900a439c11
|
Merge branch 'appveyor-installer-revise' into 'master'
Make AppVeyor installer paths consistent with Travis installer paths
See merge request STJr/SRB2!446
|
2019-01-01 11:52:42 -05:00 |
|
mazmazz
|
528c6f771a
|
Make AppVeyor installer paths consistent with Travis installer paths(assets/deployer/installer -> assets/installer)
|
2019-01-01 11:51:17 -05:00 |
|
Digiku
|
bbd878e520
|
Merge branch 'mingw-64bit-cpu-target-revise' into 'master'
MinGW64:Target nocona for 64-bit builds [revision]
See merge request STJr/SRB2!440
|
2019-01-01 11:15:34 -05:00 |
|
mazmazz
|
7916e020d2
|
Fix loop_point and song_length floating point comparisons
|
2019-01-01 10:47:16 -05:00 |
|
mazmazz
|
b7bb570f97
|
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
|
2019-01-01 10:41:40 -05:00 |
|
Digiku
|
ce7875b133
|
Merge branch 'appveyor-64' into 'mingw-64bit-cpu-target-revise'
Add 64-bit job to Appveyor
See merge request STJr/SRB2!442
|
2019-01-01 10:14:37 -05:00 |
|
Digiku
|
bd81c3190e
|
Merge branch 'appveyor-deployer' into 'appveyor-64'
Add Windows installer building to AppVeyor
See merge request STJr/SRB2!443
|
2019-01-01 10:14:25 -05:00 |
|
mazmazz
|
f00cfb7b3f
|
Use optional asset archive instead of file
|
2018-12-31 17:31:25 -05:00 |
|
mazmazz
|
d61eb7edee
|
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
|
2018-12-31 01:43:47 -05:00 |
|
Steel Titanium
|
f73501fd11
|
Update libgme to 0.6.2
|
2018-12-30 22:49:11 -05:00 |
|
mazmazz
|
e1300d5173
|
Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET
|
2018-12-30 10:43:17 -05:00 |
|
mazmazz
|
941e29780c
|
Implement install building for appveyor (deployer)
|
2018-12-30 03:42:55 -05:00 |
|
mazmazz
|
bef0bc82e4
|
Merge branch 'mingw-64bit-cpu-target-revise' into appveyor-64
|
2018-12-29 23:46:16 -05:00 |
|
mazmazz
|
e7165444b4
|
Add 64-bit DD buildbot
|
2018-12-29 23:16:08 -05:00 |
|
mazmazz
|
0fc07ebaae
|
Consolidate [%CONFIGURATION%] == [SDL64] into %X86_64%
|
2018-12-29 23:15:09 -05:00 |
|
Steel Titanium
|
0ebe5b258c
|
Inclue PNG file
|
2018-12-29 23:10:45 -05:00 |
|
Steel Titanium
|
a7b96ab83d
|
Update XPM icon
|
2018-12-29 22:52:04 -05:00 |