Commit graph

7228 commits

Author SHA1 Message Date
Alam Ed Arias
443562c3c0 appveyor: why is this failing 2016-01-27 01:26:36 -05:00
Alam Ed Arias
6e1b9549fc appveyor: fullpath to binaries 2016-01-27 01:24:32 -05:00
Alam Ed Arias
85de668d1a appveyor: move set to before_build, and drop gcc and make version 2016-01-27 01:21:29 -05:00
Alam Ed Arias
113a3cd6fc appveyor: try again 2016-01-27 01:16:42 -05:00
Alam Ed Arias
8ad8533880 appveyor: found mingw64 32-bit target, do not build with UPX 2016-01-27 01:09:51 -05:00
Alam Ed Arias
cbd85e6baf appveyor: spacing 2016-01-27 00:27:32 -05:00
Alam Ed Arias
289b5506bf appveyor: whitespace? 2016-01-27 00:15:09 -05:00
Alam Ed Arias
21c30a396c appveyor: allow one to RDP to system to debug build system 2016-01-27 00:11:54 -05:00
Alam Ed Arias
b8cafea40a appveyor: full path to make binary and no asm or png support 2016-01-26 23:56:22 -05:00
Alam Ed Arias
3db1a1fe9f add/test appveyor build 2016-01-26 23:30:53 -05:00
Monster Iestyn
2eedecb93a Get rid of unneeded tab spaces
Least I can do to make up for breaking io.open in the first place :E
2016-01-26 12:07:28 +00:00
Nipples the Enchilada
9c299e5ad4 Fix and clean up io_open after MI broke it horribly
strcpy(NULL, filename); congrats
2016-01-25 22:13:24 -06:00
Monster Iestyn
14dcd2404b Fixed compiler warnings to the best of my ability
Hopefully this all still works properly, try not to kill me if it doesn't =V
2016-01-25 22:12:54 -06:00
Monster Iestyn
63a3e03bb0 Fixed math for calculating current texture in texture animations 2016-01-25 22:12:53 -06:00
Monster Iestyn
f65c5c016a Fix shadowing in mapheaderinfo_get 2016-01-25 22:12:52 -06:00
Alam Ed Arias
c7e540a870 whitespace cleanup 2016-01-25 22:12:51 -06:00
Inuyasha
c30188f9fd interscreen is a lump name and thus needs lstring
... not just lstring though, but the behavior with i that is used elsewhere.
2016-01-25 22:12:50 -06:00
Inuyasha
f559b50995 fix bad lstring usage in map header lua
This is not how you use pushlstring! This is actually sending uninitialized memory to Lua, which is making scripts have inconsistent results (duh?)

c/o JTE: "Tell Red they're a doofus."
2016-01-25 22:12:50 -06:00
Monster Iestyn
f2f8906a19 Use modulo, not bitwise AND. My fault once again, whoops.
The point here is ColorOpposite(MAXSKINCOLORS) would have given an actual result of its own since MAXSKINCOLORS & MAXSKINCOLORS is still MAXSKINCOLORS. This shouldn't happen though, as both Color_Opposite[MAXSKINCOLORS*2] and Color_Opposite[MAXSKINCOLOR*2+1] aren't defined.
2016-01-25 22:12:49 -06:00
Inuyasha
0f2a092741 objectplace stability fix
Objectplace reallocates the mapthings list to add one more mapthing. By itself there's no problem with this.
But, mobj->spawnpoint is a pointer to the mapthing's location in the mapthings list.
So by reallocating the mapthings list, all references to mobj->spawnpoints point to freed memory.

... Oops.

Now when objectplace reallocates the mapthings list it actually corrects the locations of all mobj's spawnpoints to point to the new list.

Hooray, you can use NiGHTS objectplace again if you really want to.
2016-01-25 22:12:48 -06:00
ZTsukei
879389c379 Fresh readme.txt 2016-01-24 22:00:28 -05:00
Inuyasha
732c1a87f1 Merge branch 'texture-anims-fix' into 'next'
Texture anims fix

See issue #20

See merge request !34
2016-01-24 06:32:52 -05:00
Nipples the Enchilada
2639bf4c0b Add liolib.c to CMakeLists 2016-01-23 23:29:27 -06:00
Monster Iestyn
80fb282334 Fixed math for calculating current texture in texture animations 2016-01-23 18:59:17 +00:00
wolfy852
591b803566 Limit file write size to 1MB
If the total file size is above 1MB after writing, discard all changes.
2016-01-22 21:45:48 -06:00
Alam Ed Arias
181c875016 SDL: config.h.in is pre source tree, config.h for each cmake build 2016-01-22 17:25:19 -05:00
wolfy852
e274946528 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-01-22 00:46:32 -06:00
Inuyasha
4df951224b Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2 into public_next 2016-01-21 14:51:33 -08:00
Inuyasha
6af27212c5 Merge branch 'mapinfo-hotfix' into 'next'
Mapinfo hotfix

Fixes Inu's fix to map headers for Lua from the other day, one small compiling warning got missed somehow. =V

See merge request !33
2016-01-21 17:45:06 -05:00
Monster Iestyn
674ff51153 Fix shadowing in mapheaderinfo_get 2016-01-21 20:27:35 +00:00
Monster Iestyn
ccb0abb853 Diagonal ring springs should now be able to face any angle 2016-01-21 20:19:43 +00:00
Alam Ed Arias
c33d20acff whitespace cleanup 2016-01-21 13:50:05 -05:00
wolfy852
5579fb5240 Limit file creation/manipulation to luafiles subfolder
Also block % in filename strings
2016-01-20 22:35:53 -06:00
wolfy852
de03db99e7 Block possible methods of accessing folders outside of SRB2 2016-01-20 21:31:00 -06:00
wolfy852
569f7d15d1 Efficiency improvement in whitelist check
Thanks Inu!
2016-01-20 16:59:55 -06:00
Inuyasha
9d5718760d interscreen is a lump name and thus needs lstring
... not just lstring though, but the behavior with i that is used elsewhere.
2016-01-20 09:42:35 -08:00
Inuyasha
7d6dc3a5bb fix bad lstring usage in map header lua
This is not how you use pushlstring! This is actually sending uninitialized memory to Lua, which is making scripts have inconsistent results (duh?)

c/o JTE: "Tell Red they're a doofus."
2016-01-20 09:25:28 -08:00
Monster Iestyn
5abdb08a25 #sector.lines now returns the number of linedefs in the sector 2016-01-20 16:03:17 +00:00
Sean Ryder
7d914913dd Tabbing 2016-01-20 15:55:32 +00:00
Monster Iestyn
79e3e2351d Finally bothered to add in a method to obtain sector.lines' size internally to prevent going out of bounds.
Admittedly I knew of this particular method from the start but wanted to avoid it in favour of a less-hacky looking method of getting sector.lines' size ...but there was none to be found at all.
2016-01-20 14:56:52 +00:00
Monster Iestyn
3dc0f2b4ff Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into lua-sector-lines 2016-01-20 14:22:11 +00:00
Inuyasha
61eb9c01d1 Merge branch 'coloropposite-hotfix' into 'next'
Coloropposite hotfix

Quick fix to prevent ColorOpposite(MAXSKINCOLORS) or higher input from giving results out of the actual array's bounds. In other words, preventing it from giving you nonsense values or something.

I created the function for Lua to begin with, so clearly this is 100% my fault once again. Welp.

See merge request !31
2016-01-20 07:40:05 -05:00
Monster Iestyn
103027124b Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into lua-sector-lines 2016-01-20 12:31:21 +00:00
Inuyasha
55f0e5cab5 objectplace stability fix
Objectplace reallocates the mapthings list to add one more mapthing. By itself there's no problem with this.
But, mobj->spawnpoint is a pointer to the mapthing's location in the mapthings list.
So by reallocating the mapthings list, all references to mobj->spawnpoints point to freed memory.

... Oops.

Now when objectplace reallocates the mapthings list it actually corrects the locations of all mobj's spawnpoints to point to the new list.

Hooray, you can use NiGHTS objectplace again if you really want to.
2016-01-20 01:24:30 -08:00
wolfy852
a68e92690f Implement file type whitelist, completely remove popen and pclose
This is probably super inefficient. Someone please teach me how2C.
2016-01-20 02:26:15 -06:00
Monster Iestyn
c6a2bde7d9 Use modulo, not bitwise AND. My fault once again, whoops.
The point here is ColorOpposite(MAXSKINCOLORS) would have given an actual result of its own since MAXSKINCOLORS & MAXSKINCOLORS is still MAXSKINCOLORS. This shouldn't happen though, as both Color_Opposite[MAXSKINCOLORS*2] and Color_Opposite[MAXSKINCOLOR*2+1] aren't defined.
2016-01-18 19:46:00 +00:00
Monster Iestyn
af3c4755dc All lumps with the "SOC_" prefix in their names are now read as SOCs. 2016-01-17 19:43:26 +00:00
wolfy852
c9fe83b95d Block the use of ../ and ..\\
...and remove io.popen(), cause that shit is DANGEROUS.
2016-01-17 01:37:19 -06:00
wolfy852
eb7c36d72c 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-01-16 19:31:36 -06:00
Inuyasha
6fd3036112 Makefile can run comptime.bat from src\ too 2016-01-16 11:39:39 -08:00