stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-26 22:31:10 +00:00
Code Issues Projects Releases Packages Wiki Activity
739 commits 173 branches 41 tags 186 MiB
Commit graph

739 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alam Ed Arias
3995b9548e cherry-picking is still a bad idea 2016-02-24 12:11:29 -05:00
Alam Ed Arias
31d115bba1 remove static keyword from p_slopes.c's functions 2016-02-24 12:07:12 -05:00
Alam Ed Arias
b64f45c846 Merge branch 'next' into thokker_next 2016-02-24 12:01:08 -05:00
Alam Ed Arias
32f8c863c2 if you going to use M_CheckParm(), include the header 2016-02-22 01:07:29 -05:00
Alam Ed Arias
f5ef4bf8aa Merge branch 'master' into thokker 2016-02-22 00:16:57 -05:00
RedEnchilada
262042ac9f Also fixed it for MD2s 2016-02-21 23:02:09 -06:00
RedEnchilada
c460892a4a Fix vissprite-related crashing in OGL 2016-02-21 22:32:38 -06:00
RedEnchilada
2e92b5d9db Fix map change menu 2016-02-21 13:35:54 -06:00
RedEnchilada
8f7a1b3d1d Replace all gametypes with Thokker on menu 2016-02-21 12:29:06 -06:00
RedEnchilada
b3127da2e8 MD2 fix 2016-02-21 11:47:19 -06:00
Monster Iestyn
90288d5e5b Fixed compiler errors as well as a ton of tab spaces (apparently it's a common problem in this file anyway but whatever) 2016-02-21 11:45:15 -06:00
yellowtd
adff96fb6a Midtextures, lights, and culling fixes for ogl slopes 
There's a weird issue with lights that's hard to diagnose but otherwise
this is ready to go I think
 2016-02-21 11:45:14 -06:00
yellowtd
04b61f7c87 Fix FOF slope rendering in ogl 
should work as well as software if not better now
 2016-02-21 11:45:14 -06:00
yellowtd
c43ddb9881 GL slope walls and fixed plane culling 2016-02-21 11:45:14 -06:00
yellowtd
2572b36b48 Begin work on OGL slope support 
unfinished
 2016-02-21 11:45:14 -06: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
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
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
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
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