stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-03 15:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
747 commits 174 branches 42 tags 258 MiB
Commit graph

747 commits

This branch
This branch
All branches
Author SHA1 Message Date
yellowtd
82b983a1b5 Merge branch 'STJr/backport_unslot-music' into ems_rebuild_tempchanges 
Conflicts:
	src/d_netcmd.c
	src/dehacked.c
	src/hardware/hw_main.c
	src/sounds.h
 2016-03-05 22:51:45 -05:00
yellowtd
1816dafbe3 add sub function connect: HOST 
Start a server using connect command
 2016-03-05 22:28:33 -05: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
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 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
Inuyasha
5320424269 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next 2016-02-03 18:09:08 -08:00
Inuyasha
c05c43cfee Merge branch 'monster-misc' into 'master' 
Monster Iestyn's Miscellaneous (netplay-compatible) changes

Just cleaning up some unused or unnecessary things left in the source code, see the commits for exact changes made if you like.

May add more stuff to this branch later, there's no rush really.

See merge request !39
 2016-02-03 21:06:57 -05:00
Inuyasha
84fb4d108a Merge branch 'diagonal-spring-rings-tweak' into 'next' 
Diagonal spring rings tweak

If you didn't know before, those special placement ring lines for diagonal springs only use multiples of 45 for their angles in-game. In other words, they only face any of the 8 basic cardinal directions (N, S, E, W, NE, NW, etc). Considering that springs themselves don't follow the above behaviour, you can probably work out that's a bad thing.

This branch changes that of course, if you couldn't guess from context. Diagonal spring rings can now be placed with any angles like most thing types already could!

See merge request !37
 2016-02-03 21:05:44 -05:00
Inuyasha
f17be6641e Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next 2016-02-03 18:00:28 -08:00
Monster Iestyn
0455b572dc Removed weird test for water planes in HWR_Subsector 
It crashes when you try to test it anyway, lol
 2016-02-03 17:58:44 -08:00
yellowtd
c37c906a03 Lua script lump marker edit 
Missed a line to comment out/change
 2016-02-01 02:16:18 -05:00
yellowtd
2deea18892 Load LUA script lumps by markers 
using LU_START -> LU_END to make a range of scripts to load, pointless
but more options???
 2016-02-01 01:37:33 -05:00
yellowtd
df6281f9f6 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-01 01:37:29 -05:00
yellowtd
70e435ac16 Fix FOF slope rendering in ogl 
should work as well as software if not better now
 2016-02-01 01:37:26 -05:00
Nipples the Enchilada
fb3fb4270e Add liolib.c to CMakeLists 2016-02-01 01:37:22 -05:00
wolfy852
73592f3357 Limit file write size to 1MB 
If the total file size is above 1MB after writing, discard all changes.
 2016-02-01 01:37:18 -05:00
wolfy852
fba4e24662 Call I_mkdir on subdirectories [NEEDS CLEANUP] 
I got lazy and used a weird inefficient method, but I don't know how to clean this mess up :c At least it works.
 2016-02-01 01:37:13 -05:00
wolfy852
a2c62ea534 Limit file creation/manipulation to luafiles subfolder 
Also block % in filename strings
 2016-02-01 01:37:10 -05:00
wolfy852
ed61911e1f Block possible methods of accessing folders outside of SRB2 2016-02-01 01:37:07 -05:00
wolfy852
0253d6b381 Efficiency improvement in whitelist check 
Thanks Inu!
 2016-02-01 01:37:04 -05:00
wolfy852
3c66e24d88 Implement file type whitelist, completely remove popen and pclose 
This is probably super inefficient. Someone please teach me how2C.
 2016-02-01 01:37:01 -05:00
wolfy852
4e20a14884 Block the use of ../ and ..\\ 
...and remove io.popen(), cause that shit is DANGEROUS.
 2016-02-01 01:36:57 -05:00
wolfy852
6e643f166a Reimplement I/O library 
Note: I/O library is fully functioning in this state, but lacks security restrictions. We'll get to those later ;)
 2016-02-01 01:36:53 -05:00
yellowtd
bd954aa829 GL slope walls and fixed plane culling 2016-02-01 01:36:49 -05:00
yellowtd
ef7d6dbbf3 Weird build error fix 2016-02-01 01:36:42 -05:00
Alam Ed Arias
236170ea37 Merge branch 'master' into next 2016-01-31 20:30:53 -05:00
Alam Ed Arias
2b41a40076 appveyor: no quote? 2016-01-31 20:25:32 -05:00
Alam Ed Arias
ee75abf8ff Merge branch 'master' into next 2016-01-31 20:15:22 -05:00
Alam Ed Arias
937c8f936b appveyor: updated to GCC 5.3 2016-01-31 20:15:10 -05:00