stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-21 02:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity
12196 commits 172 branches 41 tags 280 MiB
Commit graph

12196 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alam Ed Arias
e4ad95856f Merge branch 'public_next' into master 2016-02-09 14:49:17 -05:00
Monster Iestyn
5d1c8d2968 My cherry picking somehow lead to these functions being doubled ...whoops 2016-02-09 19:35:04 +00:00
Alam Ed Arias
d09016c808 Merge branch 'public_next' into master 2016-02-09 14:19:50 -05:00
Alam Ed Arias
6000b5c980 Merge branch 'master' into next 2016-02-09 14:13:50 -05:00
Sean Ryder
ddb5652ab6 Tabbing 2016-02-09 18:05:19 +00:00
Sryder13
6b8c438e58 Change a few colours. 2016-02-09 18:05:11 +00:00
Sryder13
31deecc51c Colour Changing MD2s 
I don't know how I can move my old branch over so I've just created a new one.
 2016-02-09 18:04:59 +00:00
Monster Iestyn
700c9c2e70 Merge branch 'md2_colourchange' into 'master' 
Colour Changing MD2s

What it says it is, I haven't touched it in quite a while, but I have checked and it seems to be working.

See merge request !30
 2016-02-09 13:03:52 -05:00
Sean Ryder
b7ebb8186d Fix MD2 interpolation for FF_ANIMATE states 2016-02-09 16:20:18 +00:00
Inuyasha
8fc484cea9 Just a few more changes to TUNES, nothing special 
(cherry picked from commit 63a9c66317)
 2016-02-09 02:48:35 -08:00
Inuyasha
04d112276e Fixed some oddities with TUNES. 
(cherry picked from commit a4d05350f7)
 2016-02-09 02:48:35 -08:00
Inuyasha
1203b0aa73 Fix crash on game clear 
(No, game, you can't allocate a map header for the credits, why were you doing that before and how did it not break anything??)

(cherry picked from commit e1f9a01229)
 2016-02-09 02:48:34 -08:00
Inuyasha
caab150c92 Fixed LD413 
(cherry picked from commit 1e4c2f8aad)
 2016-02-09 02:48:34 -08:00
Inuyasha
8c17dac589 The concept of "music slots" doesn't exist anymore. 
Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore.
DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested.

(cherry picked from commit 025ca413a2)

# Conflicts:
#	src/p_user.c
 2016-02-09 02:48:33 -08:00
Inuyasha
58e685353a Attempt 2 at special stage fades. 
More basic in execution.
 2016-02-09 02:43:24 -08:00
Inuyasha
1bdd4cf641 backport state-animations from internal master to public next 
most other code in the branch did not come along for the ride.
 2016-02-09 02:39:16 -08:00
Monster Iestyn
66175d87b8 removed unused macros from doomdef.h 2016-02-08 20:10:32 +00:00
Alam Ed Arias
985b9a11cc Merge branch 'travis-ci' into 'master' 
Travis-CI builds

Merge support to build SRB2 for Linux system via Travis-Ci
This will build SRB2 with GCC and Clang to make sure we do not break Linux/GNU builds

See merge request !41
 2016-02-07 21:57:26 -05:00
Yukita Mayako
914c6c9d98 Whitespace cleanup. 2016-02-07 21:45:16 -05:00
Alam Ed Arias
dff65aa9e0 Merge branch 'public_next' into master 2016-02-07 21:25:42 -05:00
Alam Ed Arias
2dc9a4b34a Merge branch 'master' into next 2016-02-07 21:22:28 -05:00
Alam Ed Arias
6b626f1b27 build: cmake is messly 2016-02-07 20:53:27 -05:00
Alam Ed Arias
3ba827f33d Merge branch 'master' into travis-ci 2016-02-07 00:39:25 -05:00
Alam Arias
f9d56f65a8 Merge pull request #47 from ProfessorKaos64/brewmaster 
Update pkg to be fully compatible with Debian Jesse, add desktop file/artwork
 2016-02-07 00:36:04 -05:00
mikeyd
865676d341 loose the revision, pkgs switched to native format 2016-02-06 22:46:52 -05:00
mikeyd
c8ae630dfe Fix desktop file 2016-02-06 22:29:01 -05:00
mikeyd
1082ae6ba5 Missing append, <facepalm.jpg> 2016-02-06 22:17:14 -05:00
mikeyd
3ae9892064 missing install section for new desktop/png file 2016-02-06 22:08:32 -05:00
mikeyd
40dff2c123 missing space for "proper" Debian formatting 2016-02-06 22:00:59 -05:00
mikeyd
d213791054 Rename srb2 to srb2.desktop 2016-02-06 18:13:14 -05:00
mikeyd
7768ec821a add missing dirs 2016-02-06 18:08:53 -05:00
mikeyd
5c1dff7974 Next attempt at install banner/desktop shortcut 2016-02-06 17:41:53 -05:00
ProfessorKaos64
4f59bf5303 add artwork for BPM 2016-02-06 17:36:21 -05:00
mikeyd
c8e7cffa1d try install of banner image 2016-02-06 17:33:27 -05:00
mikeyd
b6203d0412 Create srb2 2016-02-06 17:26:09 -05:00
mikeyd
5d32ccffcf fix pkgconfig path for Debian Jessie 2016-02-06 17:25:27 -05:00
Alam Ed Arias
f9d23370b6 debian: the data package should be native 2016-02-06 17:10:55 -05:00
Monster Iestyn
ae2b1e8ea1 Use <= instead of ==, so that sprites for second-tier portals and beyond still display 
thx Red for spotting this
 2016-02-06 21:06:52 +00:00
Alam Ed Arias
5c09c31584 Debian: only just make srb2 depend on srb2-data (2.1.14-1)) 2016-02-06 14:56:16 -05:00
Alam Ed Arias
5d5956b650 debian: depend on srb2-data 2.1.14, not 2.1.4 2016-02-06 14:42:02 -05:00
Monster Iestyn
166fafd717 Fixed div-by-zero crash relating to portals, drawsegs and midtextures 
Had to remove Red's scale hack in order to do so, because it utterly fails when the drawseg doesn't actually belong to the portal in the first place.
 2016-02-06 18:57:26 +00:00
Alam Ed Arias
bac39b1bc0 debian: untested update for Debian packages 2016-02-06 12:31:44 -05:00
Alam Ed Arias
e9048aec48 travis: premake the cache folder 2016-02-05 23:22:06 -05:00
Alam Ed Arias
6d26a60cbe travis: cache 7z SFX 2016-02-05 23:19:38 -05:00
Alam Ed Arias
7c1f1d9c8e travis: compile with warnings as errors, skip absolute-value warnings 2016-02-05 22:54:50 -05:00
Alam Ed Arias
07fc74eaf5 clang: fixup a few clang warnings 2016-02-05 22:38:40 -05:00
Alam Ed Arias
68054a49e3 clang: cleanup 2016-02-05 22:32:14 -05:00
Alam Ed Arias
f4886657c1 clang: fixup a few clang warnings 2016-02-05 22:12:12 -05:00
Alam Ed Arias
864baeda05 cmake: fixed up to handle Clang and AppleClang 2016-02-05 21:49:24 -05:00
Alam Ed Arias
4d5f16330a travis: just run make 2016-02-05 21:33:00 -05:00