Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
James R
b7c4a82a0f
Replace C90's junk with a modest macro
2020-10-06 23:04:23 -07:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
LJ Sonic
05e8d12427
Merge branch 'next' into 'better-download'
...
# Conflicts:
# src/sdl/i_system.c
# src/win32/win_sys.c
2020-06-01 08:16:53 -04: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
SwitchKaze
afe56667b8
Update to 2.2.4
2020-05-22 16:47:51 -05:00
Louis-Antoine
362adf4576
Allow resuming the most recent file transfer
2020-05-19 11:28:24 +02:00
Alam Ed Arias
2a116ac847
Tested to be compile with Mingw64 9.1.0
...
(cherry picked from commit 5a79a446dfc3632de3e27567afd65d9782510739)
2020-05-11 18:43:24 -07:00
Alam Ed Arias
b46398b06a
fix build errors in public master
2020-05-06 18:35:54 -04:00
James Hale
51137837c4
Custom skincolors
2020-02-21 21:56:39 -05:00
Louis-Antoine
61a681ed02
Grab mouse again when closing menu, unpausing, etc
2020-01-02 00:45:28 +01:00
toaster
91d2beebfa
* Add a death animation for killing the Metal object, in case somebody wants to Lua up a Sonic CD style race finish for the Metal object, or in case of the following...
...
* Add an alternate DEMOMARKER for ending the Metal Recording on death, which kills the Metal object as well.
* Add some more relevant exceptions to the "most objects are removed when touching a deathpit" thing, primarily for the sake of ghosts and Metal playback.
2019-10-29 17:38:14 +00:00
Alam Ed Arias
8a69d97a12
Be clear on what FALLTHRU we really want
2019-09-09 15:02:13 -04:00
Alam Ed Arias
5c0912bab1
Tested to be compile with Mingw64 9.1.0
2019-08-08 21:25:46 -04:00
fickleheart
f60e92aa70
Move public demo vars to a single struct
2019-03-24 21:32:15 -05:00
Steel Titanium
deb58b0e68
Save ban list right after banning.
2019-02-21 19:47:00 -05:00
Steel Titanium
5e2cea3980
Save ban list right after banning.
2019-02-18 01:03:39 -05:00
Sally Cochenour
1928721218
Better cpusleep
...
- Default to 1, which means potential for a 1-frame loss every once in a while but no longer a complete cpu hog
- New minimum is 0, since -1 just did the exact same thing as 0.
2019-01-28 14:12:08 -05:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
Monster Iestyn
0bff44e22b
Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't
2018-11-23 19:12:48 +00:00
Steel Titanium
492eeb7009
Deallocate when I_Quit() is called instead.
2018-06-23 15:09:11 -04:00
TehRealSalt
7e9bcf5a49
Merge remote-tracking branch 'refs/remotes/srb2public/master'
2018-01-02 22:59:43 -05:00
Alam Ed Arias
faf88cf2e5
TCP: remove BADSOCKET
2017-12-26 19:56:50 -05:00
ZTsukei
f50ecc0dcd
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 17:38:24 -05:00
Sryder
68d439a783
Merge branch 'upstream/next' into zarrotsu_vanillamerge
...
# Conflicts:
# src/Makefile
# src/doomdef.h
# src/hardware/hw_main.c
# src/p_mobj.c
# src/p_user.c
# src/r_segs.c
# src/sdl/i_video.c
# src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
ZTsukei
b0b51f9a61
Some position code
2017-02-12 23:25:06 -05:00
Alam Ed Arias
1f6388a2e0
Fix up Win32 interface code misdeclaration of I_ClipboardPaste()
2016-11-03 14:35:32 -04:00
Inuyasha
bb20cfd6be
Clipboard copy/paste testing
...
(unfinished, but basics work)
2016-11-03 01:43:57 -07:00
ZTsukei
e4a970f894
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
Alam Ed Arias
57091261d9
MSVC: fixed up MSVC project
2016-05-21 23:53:04 -04:00
Inuyasha
b258b9b503
remove cpuaffinity code from SDL
...
still exists in DD (while it exists) but no longer saves.
No reason whatsoever for affinity to be settable by the game itself.
2016-02-22 23:08:34 -08:00
Alam Ed Arias
15bd266cac
SRB2 2.1.5 release
2014-03-23 12:00:29 -04:00
Alam Ed Arias
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
