Sally Coolatta
|
b5fcd74ef9
|
Merge master
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
|
2020-09-25 12:00:50 -04:00 |
|
James R
|
922f6aa9f8
|
Scale volume cvars by half, 200% max and 50% default
|
2020-09-25 02:23:44 -07:00 |
|
James R
|
c9e3281b99
|
Merge remote-tracking branch 'origin/master' into tinnitus
|
2020-09-25 01:57:08 -07:00 |
|
James R
|
e5009348f8
|
Fix fov on vertical perspective (fixes jittery view morph!!)
|
2020-09-24 16:48:56 -07:00 |
|
James R
|
ef108cbb36
|
Merge remote-tracking branch 'pub/next'
|
2020-09-20 14:07:54 -07:00 |
|
James R
|
99115d9e76
|
Update update alert message
|
2020-09-11 20:12:31 -07:00 |
|
James R
|
a7d7933c5a
|
Disable update alert if this is a prerelease
|
2020-09-01 16:22:29 -07:00 |
|
James R
|
1922a78a3b
|
Define BETAVERSION as a suffix to the version string
|
2020-09-01 15:38:27 -07:00 |
|
James R
|
d78befc713
|
Merge branch 'master' into next
|
2020-08-31 16:10:05 -07:00 |
|
James R
|
7cbc9add07
|
Kill NOHS
(cherry picked from commit a79316b375)
|
2020-08-31 16:06:40 -07:00 |
|
James R
|
b66b0bf648
|
Update versions to 1.3
|
2020-08-30 19:06:31 -07:00 |
|
James R
|
754347987d
|
Fix stupid NONET
(cherry picked from commit 679bfa21edec6b652def93082da5586e6c755678)
|
2020-08-29 18:19:39 -07:00 |
|
James R
|
e6c914c7b2
|
Fix stupid NONET
|
2020-08-29 17:51:59 -07:00 |
|
James R
|
d31fb748b2
|
Do not do master server things when NOCURL
(cherry picked from commit b681b6e9e6)
|
2020-08-29 17:45:28 -07:00 |
|
James R
|
a79316b375
|
Kill NOHS
|
2020-08-24 17:58:39 -07:00 |
|
Sally Coolatta
|
36c5abf611
|
Fix version string
|
2020-08-23 04:44:05 -04:00 |
|
FlykeSpice
|
2424418390
|
Remove ESLOPE #ifdef(backport from srb2 2.2)
|
2020-08-20 13:02:13 -04:00 |
|
James R
|
b681b6e9e6
|
Do not do master server things when NOCURL
|
2020-08-16 21:42:58 -07:00 |
|
Sally Coolatta
|
5a6263c36b
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
Sally Coolatta
|
e14f4a5842
|
Merge g_demo.c, remove OLD22DEMOCOMPAT
|
2020-08-10 12:14:23 -04:00 |
|
lachwright
|
908bd42dc4
|
Merge doomdef.h
|
2020-08-10 12:06:20 +08:00 |
|
Sally Coolatta
|
e296e1309a
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
Jaime Passos
|
f6a5acc6f3
|
Remove LUA_PATCH_SAFETY
|
2020-08-08 14:56:04 -03:00 |
|
James R
|
72e225f8c9
|
Rename digmusicvolume to musicvolume, default soundvolume and musicvolume to 100%
|
2020-08-07 12:43:59 -07:00 |
|
James R
|
9077a4ff03
|
Kill MIDI
|
2020-08-07 12:39:08 -07:00 |
|
James R
|
374d032a6b
|
Clean up stuff, make volume work again
|
2020-08-07 12:29:37 -07:00 |
|
James R
|
7adf2159f6
|
Reduce songs and sounds to 1/4 volume, add a musicdef option for volume
|
2020-08-06 21:24:41 -07:00 |
|
Sally Coolatta
|
59eb714bef
|
Merge doomdef.h
|
2020-08-06 17:42:29 -04:00 |
|
Sally Coolatta
|
cdb0310982
|
Merge info.c/h
|
2020-08-06 17:38:29 -04:00 |
|
SteelT
|
6d850b51d9
|
Handle doomdef.h a bit
|
2020-08-04 01:06:15 -04:00 |
|
Steel Titanium
|
62c85ea4a5
|
WIP: Remove support for DOS
WIP because I don't know if this wording is right for the error.
|
2020-07-25 18:55:51 -04:00 |
|
James R
|
3a34fa8561
|
Merge remote-tracking branch 'origin/master' into next
|
2020-07-12 17:11:22 -07:00 |
|
James R
|
d06eb9dc5f
|
Merge branch 'netid-take-2' into 'next'
Use ordered id for netvars instead of shitty hash
See merge request STJr/SRB2!1010
|
2020-07-11 02:00:06 -04:00 |
|
James R
|
f4989f36bd
|
Fix a lot of stuff related to the version automation
|
2020-07-10 22:39:46 -07:00 |
|
James R
|
d92afe87a0
|
Automate VERSION/SUBVERSION; move version related definitions to version.h
CMake support. Srb2win.rc still needs touchy, whatever.
|
2020-07-10 22:20:33 -07:00 |
|
Steel Titanium
|
2b63f1af4d
|
I screwed up
|
2020-07-10 23:16:18 -04:00 |
|
Steel Titanium
|
b53e6e834d
|
Update version number
|
2020-07-10 17:29:03 -04:00 |
|
James R
|
cc62645209
|
Contact the master server admims
|
2020-07-06 19:15:40 -07:00 |
|
Steel Titanium
|
d53d65b798
|
Update the version number
|
2020-07-06 21:29:02 -04:00 |
|
Louis-Antoine
|
36ad16452c
|
Delete CLIENT_CONNECTIONSCREEN and JOININGAME defines
|
2020-06-27 02:01:16 +02:00 |
|
James R
|
b89be9f179
|
Cvar compatibility with older demos
|
2020-06-19 18:04:20 -07:00 |
|
SteelT
|
dbd5198ac2
|
Merge branch 'marathonmode' into 'next'
MARATHON RUN
See merge request STJr/SRB2!941
|
2020-06-17 19:36:10 -04:00 |
|
James R
|
0349cc4127
|
Merge remote-tracking branch 'origin/master' into http-mserv
|
2020-06-12 23:36:39 -07:00 |
|
Hannu Hanhi
|
6961bba693
|
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
|
2020-06-07 20:01:05 +03:00 |
|
James R
|
3162a203be
|
Merge remote-tracking branch 'pub/master' into wtf
|
2020-06-03 15:57:09 -07:00 |
|
Sally Coolatta
|
63917ffccc
|
The start of the scary 2.2 merge
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
|
2020-05-29 13:43:38 -04:00 |
|
sphere
|
a0a16e2e79
|
Fix the "Custom skincolors" branch not compiling with GCC 10.
|
2020-05-28 18:43:04 +02:00 |
|
SwitchKaze
|
58cac1fd73
|
Make colors UINT16, increase color freeslots to 1024
|
2020-05-23 19:35:36 -05:00 |
|
SwitchKaze
|
afe56667b8
|
Update to 2.2.4
|
2020-05-22 16:47:51 -05:00 |
|
Louis-Antoine
|
74fa35221d
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
# Conflicts:
# src/hardware/hw_main.c
# src/p_spec.c
|
2020-05-18 16:14:05 +02:00 |
|