TehRealSalt
36b52e1c67
Merge remote-tracking branch 'refs/remotes/srb2public/next'
...
# Conflicts:
# src/f_finale.c
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/m_misc.c
2018-04-07 18:43:59 -04:00
TehRealSalt
581e231a3e
sonicitems porting, Part 2
...
BUT with more tweaks on top of that:
- matchesplayed can go up & unlock stuff regardless of modifiedgame
- votetime added to menu
- flame jets are fullbright (been meaning to do this for a while)
- screenshots are prefixed with kart instead of srb2 (ditto)
2018-02-13 18:13:27 -05:00
toasterbabe
8090ea4ed0
Stop leaking names.
2018-01-30 21:25:28 +00:00
TehRealSalt
80f62a057d
SUCCESS
2017-12-17 22:27:26 -05:00
TehRealSalt
5fe2f4928f
Merge remote-tracking branch 'refs/remotes/srb2public/next' into zarrotsu
...
# Conflicts:
# src/doomdef.h
# src/sdl/i_main.c
# src/sdl/i_video.c
# src/y_inter.c
2017-10-17 15:53:34 -04:00
TehRealSalt
727d55b64e
Merge remote-tracking branch 'refs/remotes/srb2public/public_flatsprite' into zarrotsu
...
# Conflicts:
# src/doomdef.h
2017-10-17 00:40:38 -04:00
Alam Ed Arias
7f98c5c804
Build: do not error on fallthrough
2017-09-28 10:02:08 -04:00
ZTsukei
a1f2f5b675
New level tag "ZONETITLE" can be set to replace the word "ZONE" in a level. "NOZONE" overrides it and forces no display at all.
2017-09-01 13:01:59 -04:00
Monster Iestyn
48777e60ed
check i not add, silly
2017-03-29 21:27:44 +01:00
ZTsukei
f50ecc0dcd
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 17:38:24 -05:00
toasterbabe
5f4f6fdac8
Public remake of a merge request I shouldn't have put in Internal in the first place.
2016-09-26 18:35:13 +01:00
Monster Iestyn
69f556d40a
Split AA trees code from m_misc.c/.h into m_aatree.c/.h
...
Also updated any relevant project files that I can think of to include the new files, as well as the makefile of course. Some of the other project files haven't been touched in years so I'll leave those alone ...unless someone objects
2016-06-05 21:29:40 +01:00
Inuyasha
f07585191b
copyright dates/statements updated and such
...
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
Inuyasha
7c79bbc0b3
Proper overflow checking, applied to FOFs and midtex's too
...
This fixes the annoying flickering when you pass by water, FOFs, tall grass, etc.
2016-05-02 05:29:30 -07:00
Alam Ed Arias
6000b5c980
Merge branch 'master' into next
2016-02-09 14:13:50 -05:00
Alam Ed Arias
68054a49e3
clang: cleanup
2016-02-05 22:32:14 -05:00
Inuyasha
06dea3ab78
Branch and revision information in builds
...
Also makes comptime.bat work with git if able.
Development builds will now show the branch and the SHA1 hash of the revision. Also been tested to work with subversion, where it displays "Subversion r####". You know, just in case.
2016-01-14 07:46:27 -08:00
Alam Ed Arias
2609745b51
it was me, Duo!
2015-02-06 10:22:16 -05:00
Alam Ed Arias
ed0d70feca
do not typedef off_t when we do not need to
2015-02-05 17:32:27 -05:00
Alam Ed Arias
f03e591f64
change SDL into HAVE_SDL
2014-07-25 19:10:24 -04:00
Alam Ed Arias
f3bd8c6ef4
Merge branch 'master' into sdl2
2014-05-02 09:01:51 -04:00
Alam Ed Arias
5b5fbe9aad
fix suport for libpng 1.6
2014-04-21 23:07:02 -04:00
Alam Ed Arias
69d3f325f5
off_t for linux onl;y
2014-03-24 19:40:04 -04:00
Ronald Kinard
2a827a98bb
Initial SDL2 renderer impmlementation work.
2014-03-19 02:31:50 -05:00
Alam Ed Arias
2fed5d1270
SRB2 2.1.3 release
2014-03-18 13:56:54 -04:00
Alam Ed Arias
3e0b5ef1cd
SRB2 2.1.1 release
2014-03-15 18:55:07 -04:00
Alam Ed Arias
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
