Commit graph

544 commits

Author SHA1 Message Date
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
yellowtd
6c8b9d5f89 Begin work on OGL slope support
unfinished
2016-01-17 00:29:08 -05:00
yellowtd
25acc29d96 Merge remote-tracking branch 'refs/remotes/STJr/master' into ems-rebuild 2016-01-16 20:26:47 -05:00
Monster Iestyn
554c62891d Merge branch 'some-small-compiling-fix' into 'master'
Some small compiling fix

~~See commit description for details, I'm not repeating it all here with different words.~~

~~Needs testing before we actually merge the changes in, I don't have anything besides Windows so I can't actually try this fix out for myself sadly. :(~~

This was originally a quick branch I made to fix a problem so that @wolfy852  could compile with Linux on some thing of his ...turned out not to be the only problem, and then I found a slightly unrelated problem altogether. So it's now a small assortment of compiling-related fixes.

Also should be merged to next, which is hopefully obvious.

See merge request !29
2016-01-11 21:20:01 -05:00
Monster Iestyn
a8e4234d74 Fixed implicit declaration of some functions if compiling without OpenGL support
Not related to Wolfy's problems afaik... this branch seems to be turning into a misc compiling fixes branch now
2016-01-11 14:51:55 +00:00
Monster Iestyn
be266c27e1 Removed void typedef for GLPatch_t used when HWRENDER is undefined
Apparently all parts of the source code that require GLPatch_t are themselves used only if HWRENDER is defined. Do I need to say more?

Not sure if this will fix Wolfy's latest problem or not though
2016-01-10 20:56:09 +00:00
Monster Iestyn
146011937a Fixed what appears to be a minor including error in sdl/i_system.c
Basically, Wolfy's linux (non-CMake) compiling apparently fails here, and config.in.h actually lives outside of the sdl folder. Blame a particular someone for blindly copy+pasting these includes in this file without considering the consequences when adding support for CMake everywhere.
2016-01-10 18:24:58 +00:00
yellowtd
3e9cf12802 Fix MD2s
redenchiladafind
2016-01-03 00:27:42 -05:00
yellowtd
68ceb93213 nonsense removal
removing a dummy check
2016-01-03 00:18:17 -05:00
Monster Iestyn
775ccde424 Add M_Options(0); to F4/F5/F7 code to prevent them going to Main Menu instead of SP/MP pause menus when the latter should be shown 2015-09-01 22:56:45 -04:00
yellowtd
6de053a835 Merge branch 'STJr/angles' into ems-rebuild 2015-08-19 00:34:44 -04:00
RedEnchilada
50b5e978cc Support ceiling/backsector vertex slopes 2015-08-03 23:09:50 -05:00
RedEnchilada
1f5fc04d60 Add vertex slopes 2015-08-03 22:15:59 -05:00
RedEnchilada
c7b6cd705f Separate P_LoadThings into two functions to make the next commit cleaner 2015-08-03 19:27:10 -05:00
RedEnchilada
14ea936f74 Sync mobj->standingslope in netgames 2015-08-03 18:06:42 -05:00
RedEnchilada
51284c01d8 Start using slope flags/id in creation process 2015-08-03 17:39:33 -05:00
RedEnchilada
049bbce5c0 Add data to slope struct that will be useful later 2015-08-03 17:37:50 -05:00
RedEnchilada
6026fa42eb Add masked FOF slopes (+other rendering tweaks) 2015-08-03 14:47:05 -05:00
yellowtd
e14e619acf Update d_main.c 2015-07-04 05:07:10 -04:00
yellowtd
56e2b4106d Merge remote-tracking branch 'STJr/angles' into ems-rebuild 2015-06-25 12:31:40 -04:00
RedEnchilada
e00d682185 Fix issue with objects getting stuck IN floors 2015-05-25 13:25:23 -05:00
RedEnchilada
5e18db79e9 Fix mobjs sometimes clipping through floors (whoops!) 2015-05-25 12:16:19 -05:00
RedEnchilada
d9d3752b4e Unbreak FOF specials 2015-05-25 11:46:09 -05:00
RedEnchilada
32759312a1 Shut up the Kalaron 2015-05-24 18:22:56 -05:00
RedEnchilada
bddcf98355 Remap slope line specials to 7xx range: shim old values for now 2015-05-24 15:59:17 -05:00
RedEnchilada
a9d49cd9fa Make all specials reliant on floor touch work right with sloeps
(I might've missed some, though)
2015-05-24 12:53:30 -05:00
RedEnchilada
a9dba0ffd1 Condense GetFloor/CeilingZ into fewer functions, and use macros for the rest 2015-05-24 11:27:52 -05:00
RedEnchilada
e0d97e4b1a Slope planes should now not turn into static in 99% of cases 2015-05-23 16:27:15 -05:00
RedEnchilada
109d379980 Fix conveyor slopes eventually turning to static 2015-05-23 15:44:53 -05:00
RedEnchilada
b121bcca68 Remove P_GetZAtf (it didn't seem to work right anyway) 2015-05-23 12:23:24 -05:00
RedEnchilada
485f671f23 Sloped planes now respect flat offsets 2015-05-23 02:18:32 -05:00
RedEnchilada
a5d7356fd2 Sayonara, m_vector.c 2015-05-23 01:32:28 -05:00
RedEnchilada
3629a2141b Slope planes work again. I hacked an alignment fix in too. 2015-05-23 01:19:38 -05:00
RedEnchilada
89319b1c2a Dummy out m_vector and use m_fixed's functions instead
These functions were already here before, and I /swear/ the slope
physics became slightly less glitchy after switching to them...
Only issue is the slope plane mapping code hasn't been properly
converted yet, so they don't render properly for now.
2015-05-22 22:07:07 -05:00
RedEnchilada
3f8e7b1739 Revert/remove unused/broken junk from original slopes port
m_vector removal to come later. The little thing commented out in it
is so I could revert the weird tables.c change.
2015-05-22 20:57:58 -05:00
RedEnchilada
8c54ee44e7 Slopey physics for some things that aren't players
This is incredibly messy and probably needs redone differently at
some point, but... fuck it.
2015-05-22 12:33:12 -05:00
RedEnchilada
fb9d07b8ba Bugfixes to sloped FOF plane clipping 2015-05-21 22:13:51 -05:00