stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-02 09:12:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
5627 commits 177 branches 41 tags 188 MiB
Commit graph

5627 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
mazmazz
2aa7ee70fe Disable UPX by default in appveyor 2018-12-29 22:51:10 -05:00
mazmazz
34534428fd Add 64-bit SDL builds to appveyor config 2018-12-29 22:17:41 -05:00
mazmazz
3d2e58861d Rename M5 to ARCHOPTS; allow override by command line 2018-12-29 21:55:35 -05:00
mazmazz
4cfacf5cde Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile 2018-12-29 21:14:50 -05:00
Digiku
80e30c6aaa Merge branch 'MSVC-ARM' into 'master' 
ARM and ARM64 support with MSVC toolchain

See merge request STJr/SRB2!412
 2018-12-28 01:05:40 -05:00
Steel Titanium
d048e7cbec Don't set if LINUX64 is defined 2018-12-27 21:17:02 -05:00
Steel Titanium
5ba0863876 Stupid restrictions 2018-12-27 19:00:18 -05:00
Steel Titanium
4a05fd5f26 More explict check 2018-12-27 18:54:10 -05:00
Steel Titanium
6dddf61265 Target nocona for 64-bit builds 2018-12-27 00:56:33 -05:00
james
0b857f127f Update capslock state on window re-focus 2018-12-26 15:49:57 -08:00
Digiku
da9447342c Merge branch '2123-version' into 'master' 
Update code versions to 2.1.23

See merge request STJr/SRB2!435
 2018-12-26 17:14:58 -05:00
Digiku
ebb4c65d92 Merge branch 'srb2-chat-nonet' into 'master' 
Hide SRB2-CHAT behind #ifndef NONET

See merge request STJr/SRB2!434
 2018-12-26 17:13:23 -05:00
mazmazz
60bdc056f8 Also hide Chat Options if NONET 2018-12-26 16:41:39 -05:00
mazmazz
894c139bf1 Update code versions to 2.1.23 2018-12-26 16:31:43 -05:00
mazmazz
814db7e371 Hide SRB2-CHAT behind #ifndef NONET 2018-12-26 16:20:17 -05:00
Monster Iestyn
e39c6b47e7 Merge branch 'vanilia-savegame-fix' into 'master' 
Fix saving game progress on a unmodified game

See merge request STJr/SRB2!433
 2018-12-26 16:05:16 -05:00
Steel Titanium
4f18ec60bc Fix saving progress on vanilia 2018-12-26 15:47:12 -05:00
Digiku
98e46f5b1c Merge branch 'large-room-msvc-fix' into 'next' 
Fix -ANGLE_180 because MSVC complains

See merge request STJr/SRB2!432
 2018-12-25 01:15:02 -05:00
mazmazz
fa6f791ec3 Fix -ANGLE_180 because MSVC complains 
-ANGLE_180 evaluates equal to ANGLE_180.
 2018-12-25 01:14:05 -05:00
Digiku
26f956acea Merge branch '2122-version' into 'next' 
Update code versions to 2.1.22

See merge request STJr/SRB2!402
 2018-12-25 00:45:14 -05:00