Commit Graph

846 Commits

Author SHA1 Message Date
Alam Ed Arias 49b1c277af Merge branch 'next' into portal-fix 2016-03-25 18:43:07 -04:00
Alam Ed Arias a567ce8e8e Merge branch 'master' into next 2016-03-25 16:40:13 -04:00
Monster Iestyn 5dd0e533b3 Removed unused "supdate" variable 2016-03-15 21:18:25 +00:00
Alam Ed Arias c63b746714 Merge branch 'master' into next 2016-03-14 21:58:12 -04:00
Alam Ed Arias 19e82bc866 Merge remote-tracking branch 'origin/master' 2016-03-14 21:57:49 -04:00
Alam Ed Arias c4e54d52e7 comptime.bat: restore echo off 2016-03-14 21:54:53 -04:00
wolfy852 bbe93a6d31 comptime.bat: Put @echo off back in 2016-03-14 20:36:37 -05:00
Alam Ed Arias 873fa10fe1 comptime.bat: Windows 8.1 sucks 2016-03-14 17:48:33 -04:00
Alam Ed Arias 6301deb2a5 Merge branch 'master' into next 2016-03-14 13:25:37 -04:00
Inuyasha 2f21c24d77 Makefile can run comptime.bat from src\ too 2016-03-14 12:44:40 -04:00
Inuyasha 7e174290d7 SVN needs the revision prefixed with 'r' 2016-03-14 12:44:16 -04:00
Inuyasha 2ecdd9e6f9 Branch and revision information in builds
Also makes comptime.bat work with git if able.
Development builds will now show the branch and the SHA1 hash of the revision. Also been tested to work with subversion, where it displays "Subversion r####". You know, just in case.
2016-03-14 12:43:08 -04:00
Alam Ed Arias f5b56f2a07 fixup 2016-03-14 12:28:22 -04:00
Alam Ed Arias f9949a3026 dropping NOVERSION, you will not build SRB2 without a SCM 2016-03-14 12:24:51 -04:00
Wolfy 3232549971 Merge branch 'changeangle-hotfix' into 'next'
Changeangle hotfix

Fixes an issue with A_ChangeAngleAbsolute reported on the MB https://mb.srb2.org/showthread.php?t=41236

See merge request !59
2016-03-11 02:57:51 -05:00
Alam Ed Arias 81fc9df8d3 Merge branch 'master' into next 2016-03-10 18:02:23 -05:00
Alam Ed Arias ee5190480d Merge branch 'cmake-fix' into 'master'
Cmake fix

This branch SHOULD fix issue #14, but I haven't been able to check for myself without any GME stuff to test in-game with.

See merge request !58
2016-03-10 18:00:51 -05:00
Alam Ed Arias 65c94218b9 Merge branch 'next' into changeangle-hotfix 2016-03-10 17:39:35 -05:00
Alam Ed Arias 9599d7f6dd Merge branch 'master' into next 2016-03-10 16:47:55 -05:00
Alam Ed Arias ab4179dfb0 Merge branch 'travis-ci' 2016-03-10 16:46:57 -05:00
Alam Ed Arias 509516f59f travis: enable apt and ccache cache 2016-03-10 16:38:06 -05:00
Inuyasha 83e9eb6df4 patch.dta officially in use. Version number updated. 2016-03-09 18:30:11 -08:00
Alam Arias 771c1ecb8a Merge pull request #68 from Yukitty/revert-Lua-angles
Revert "Change angle_t handling in Lua."
2016-03-09 11:58:51 -05:00
Inuyasha a7cb049b65 leave a dummy string in dehacked, nothing more.
a courtesy fuck you to gitlab for making me have to keep
the previous screwed up bullshit in this branch.
2016-03-09 06:23:57 -08:00
Inuyasha f40cfb0271 Revert "MFE_DUMMY now exists to fill the slot where MFE_PUSHED was, bleh"
This reverts commit 4625118ee8.
2016-03-09 06:22:40 -08:00
Monster Iestyn 4625118ee8 MFE_DUMMY now exists to fill the slot where MFE_PUSHED was, bleh 2016-03-09 14:03:20 +00:00
Monster Iestyn bf415b8618 Revert "Shifted down the last few mobj eflags to close gap left by MF2_PUSHED -> MFE_PUSHED undo"
This reverts commit 280e932f02.
2016-03-09 13:59:10 +00:00
Monster Iestyn 280e932f02 Shifted down the last few mobj eflags to close gap left by MF2_PUSHED -> MFE_PUSHED undo 2016-03-09 13:38:30 +00:00
JTE 54f95eb387 Revert "Change angle_t handling in Lua."
This partially reverts commit ef0e61fc33.
2016-03-09 08:38:10 -05:00
Inuyasha 5a38088623 Well, we don't need "experimental" slopes anymore either
Not when we have properly working ones!
2016-03-09 01:09:21 -08:00
Inuyasha 6aa708b5af I don't think we need the BLUE_SPHERES define anymore... 2016-03-09 00:49:35 -08:00
Inuyasha 7ae87cc2c6 Revert "No more stupidity for No More Enemies special plz"
This reverts commit 474ad01b46.
2016-03-08 22:22:30 -08:00
Inuyasha cfcd7ce0d3 Readded EvalMath to Lua.
There is a caveat to this: The first time EvalMath is used, a
deprecated function warning will be shown to the user that tells
them to use _G[] instead.

This reverts commit 9d36cf37bd.
2016-03-08 22:15:26 -08:00
Inuyasha 694220155e Revert "MF2_PUSHED is now MFE_PUSHED, for the simple reason that it makes more sense as an eflags object flag than a flags2 object flag!"
This reverts commit c8c7878005.

# Conflicts:
#	src/dehacked.c
#	src/p_mobj.c
#	src/p_mobj.h
2016-03-08 21:30:12 -08:00
Alam Ed Arias b173c3e31e Merge branch 'next' into portal-fix 2016-03-07 16:44:59 -05:00
Alam Ed Arias 6b0c73f2ec Merge branch 'master' into changeangle-hotfix 2016-03-07 16:25:13 -05:00
Alam Ed Arias 178d904bb9 Merge branch 'master' into portal-fix 2016-03-07 16:22:41 -05:00
Alam Ed Arias ae3b7e0623 Merge branch 'master' into next 2016-03-07 16:18:08 -05:00
Alam Ed Arias fbbc028ff2 Merge branch 'master' into cmake-fix 2016-03-07 16:17:38 -05:00
Monster Iestyn eab51414f3 Fix typo in A_ChangeAngleAbsolute 2016-03-07 21:16:02 +00:00
Alam Ed Arias c7b18207f5 travis: do not error on making cache folder, if it already restored from cache 2016-03-07 16:06:04 -05:00
Monster Iestyn 4ab2c336e7 Possibly fixed the issues with LibGME mentioned in issue #14.
Not even the HAVE_LIBGME macro was defined apparently, huh.
2016-03-06 19:32:07 +00:00
Wolfy e769b7882c Merge branch 'lua-sector-lines' into 'next'
Lua sector lines

Adds support for "sector.lines" in Lua, an array containing all the linedefs in a particular sector variable:

#sector.lines returns the number of lines in the sector.

sector.lines\[ _i_ \] (e.g. sector.lines[0], sector.lines[1], sector.lines[2], etc ....) gives you individual linedefs in the sector. If the number you supply is equal to or greater than #sector.lines, this returns nil.

Test script for your benefit: (see comments)

Type "luatest" in console in any level and you'll get a few print messages that tests these features for sectors[0]

See merge request !32
2016-03-04 10:23:42 -05:00
Wolfy 7eaf3cf221 Merge branch 'new-SOC-lump-names' into 'next'
SOC_**** lump name support

Exactly what it says on the tin: lumps with "SOC_" prefix now are read as SOC lumps like with MAINCFG/OBJCTCFG. Go nuts.

As a bonus, I've changed things with SOC lump detection so MAINCFG, OBJCTCFG and the new SOC_**** lumps are loaded in the order you find them in WAD files (rather than an arbitrary load-MAINCFG-then-load-OBJCTCFG thing as before). All of these are still loaded after Lua scripts though, mind.

See merge request !38
2016-03-04 10:23:20 -05:00
Wolfy 891c7843ca Merge branch 'Lua-video-lib-expansion' into 'next'
Lua video lib expansion

New video/drawer library functions for hud.add to use:

v.width() and v.height() return the screen width and height respectively (in other words you get the screen resolution), while v.renderer() returns the string for the renderer used ("software", "opengl", or "none").

Possibly add more stuff later, but for now these things at the least can be merged in next

See merge request !40
2016-03-04 10:21:15 -05:00
Monster Iestyn 4302cfaa00 Merge branch 'playerspawn-hook' into 'next'
Add PlayerSpawn hook to Lua

I don't know how I did this but I did. Something about staring at code from 3AM till 5AM...

Here's a test script too:

```Lua
addHook("PlayerSpawn", function(player) player.health = 99 end)

```

See merge request !48
2016-03-04 10:19:18 -05:00
Inuyasha e6f7b8ab26 Merge branch 'version-constants' into 'next'
Version constants for Lua

Pretty simple thing. Allows scripters to use VERSION, SUBVERSION, and VERSIONSTRING to check the game's version and potentially futureproof scripts. Have tested and confirmed working on my end.

See merge request !55
2016-03-03 22:33:36 -05:00
Inuyasha a8bca89dbd Merge branch 'backport_unslot-music' into 'next'
BACKPORT: removal of music slots

Relevant commits cherry-picked. Basically everything except the internal music track name switches.

See merge request !43
2016-03-03 22:31:21 -05:00
STJrInuyasha 990c78686e Merge pull request #66 from Yukitty/crashfix-Lua-hook_NetVars
Crashfix Lua hook_NetVars
2016-03-03 15:33:08 -08:00
Yukita Mayako b368936b03 Fix bad logic in LUAh_NetArchiveHook rewrite...
Argh, I knew I was forgetting something! archFunc is the argument to be passed to the hooks, not tables!
2016-03-03 17:30:46 -05:00