lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3199 commits 1 branch 29 tags 122 MiB
Commit graph

3199 commits

This branch
This branch
All branches
Author SHA1 Message Date
toasterbabe 918edda672 * Make exitlevel only work if someone's at the exit or you've visited the next map before. 
* Added a message to suggest changing cheats before release to a future self.
* Removed the gametype selection menu, and baked its contents into the level platter instead (with an additional dose of pretty - https://cdn.discordapp.com/attachments/293238104096112641/359338275338584064/unknown.png)
 2017-09-18 15:04:38 +01:00
toasterbabe 970268ec38 Redid that ridiculous lastcoop thing as an MV_MP thing, which also means it gets properly cleared when you load mods with new save data. 2017-09-17 22:05:13 +01:00
toasterbabe b217e9eb92 * Made levels with TOL_COOP inaccessible from the multiplayer map select unless you'd visited them in singleplayer (mapvisited, saves to gamedata) or visited a Co-op level number equal to/after it (multiplayer, doesn't save to gamedata) 
* Tweaked Pandora's box to add:
 - A mid-game link to the Addons menu.
 - A button to give everyone SF_SUPER (except Tails in non-devmode executables).
 2017-09-17 16:49:39 +01:00
Monster Iestyn d65e23f3ec Merge branch 'public_next' 2017-09-04 20:19:47 +01:00
Monster Iestyn d565cc6a2c Merge branch 'master' into next 2017-09-04 20:16:06 +01:00
Monster Iestyn 017df6cd75 Merge branch 'SDL2_RelMouse' into 'master' 
SDL2: Relative mouse mode

See merge request !206
 2017-09-04 15:11:50 -04:00
Monster Iestyn 1aa4972021 Merge branch 'floorzatpos-slopefix' into 'next' 
P_FloorzAtPos slope fix

See merge request !208
 2017-09-04 15:00:49 -04:00
Monster Iestyn 50917d2ee2 P_FloorzAtPos: Check the normal floor's slope as well as FOF slopes, silly. 2017-08-30 19:21:23 +01:00
Monster Iestyn 36977a5eda SDL_SetRelativeMouseMode(SDL_TRUE) already does what HalfWarpMouse does 
Also, don't post an ev_mouse event_t if not in relative mouse mode, so the camera doesn't jerk when the mouse enters the window
 2017-08-22 22:53:18 +01:00
Monster Iestyn 821a1810f7 Moved lrounding of mouse motion events to the actual point an event is made 
Also did some cleanup and moving around, as well as adding comments
 2017-08-21 21:38:29 +01:00
Monster Iestyn 10cbe2c82b Turns out the issue was with fullscreen! All I have to do is factor in the resolution/real window size ratio apparently (which was already done before) 
Also changed movemousex/y to INT32
 2017-08-19 22:54:30 +01:00
Monster Iestyn 758e9c4558 Merge all (relative) mouse motion events into one mouse event 
This fixes SDL2_RelMouse's weaker sensitivity for me on Windows (but apparently not for others??)
 2017-08-19 21:39:04 +01:00
Monster Iestyn c17eb94ef7 Merge branch 'lua-spritedefs' into 'master' 
New Lua video lib functions for getting sprite patches

See merge request !105
 2017-08-18 11:35:25 -04:00
Monster Iestyn 9703aa2864 Feed skin and sprite2 through P_GetSkinSprite2 to change sprite2 if necessary (if for instance the supplied sprite2 didn't actually exist) 2017-08-16 21:00:18 +01:00
Monster Iestyn c9acc3cee4 Merge branch 'master' into lua-spritedefs 2017-08-16 20:13:26 +01:00
Monster Iestyn 3795a15164 Merge branch 'public_next' 2017-08-16 20:11:33 +01:00
Monster Iestyn 9b788b55f6 Merge branch 'patch-lua-cv_registervar' into 'public_next' 
Patch: Lua CV_RegisterVar

See merge request !109
 2017-08-16 15:06:41 -04:00
Monster Iestyn 9f726bc66d Merge branch 'new_coop' into 'master' 
New Co-op

See merge request !104
 2017-08-16 15:01:39 -04:00
Monster Iestyn 75d363527b Merge branch 'toastfixes' into 'master' 
An assortment of relatively minor bugfixes and behaviour tweaks

See merge request !110
 2017-08-16 14:58:30 -04:00
toasterbabe f6670fea76 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into new_coop 
# Conflicts:
#	src/r_things.h
 2017-08-16 19:29:23 +01:00
Monster Iestyn a33b09ca05 Merge branch 'skin_patch' into 'master' 
Skin patching (P_SKIN) and killing DELFILE

See merge request !63
 2017-08-16 14:20:21 -04:00
toasterbabe 6d3691d3d1 woops, compile fix 2017-08-15 22:40:19 +01:00
toasterbabe 06dc30ea54 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into skin_patch 
# Conflicts:
#	src/dehacked.c
 2017-08-14 21:34:37 +01:00
toasterbabe 6e79de3de8 Patched an out-of-bounds crash with papersprites in the least resource-intensive way I could find (xiscale not fitting perfectly into frac). This will have to do until papersprites get a make-over at some point. 2017-08-11 16:00:45 +01:00
toasterbabe a00deee209 * Combine all shield-giving functions into a single one, since they were practically identical anyways. 
* Expose P_SwitchShield(player, shieldnum) to Lua.
 2017-08-10 13:57:09 +01:00
toasterbabe 709a43d3be Fix that thing where you-know-who didn't have a lives icon. 2017-08-09 22:51:29 +01:00
toasterbabe 8175e0836e Remove all trace of harddefs, considering we use an ANIMDEFS lump in srb2.srb now. 2017-08-09 22:09:06 +01:00
toasterbabe 1cab08e39f * Add SH_PROTECTSPIKE as a shield flag, because I kinda wanted to when I originally made shields, and SUBARASHII's cactus shield vindicated my desires. 
* Tweaked the values of the shield constants slightly so that no base-game shield is made up of flags and only flags.
 2017-08-09 20:56:31 +01:00
toasterbabe a3767fedac Clean out code/update comments relating to TEXTUREn, TEXTURE (SOC), PNAMES, and ANIMATED. 2017-08-08 22:03:37 +01:00
Yukita Mayako 720987367a Prevent cvar naming conflicts from pointing Lua to the wrong internal data. 2017-08-08 14:27:02 -05:00
toasterbabe a61be91523 Add a new feature to MT_PARTICLEGEN, per Sphere's request - if you give the parameters line a backside, then the backside x offset controls the number of tics between particle spawn. (By default, it's 3.) 2017-08-08 18:22:44 +01:00
toasterbabe 1d11a14f64 Getting polyobject flats to the equivalent functionality BEFORE I changed up how floor offsets worked. (Doesn't touch OGL, since they work perfectly there.) 2017-08-08 15:32:12 +01:00
Monster Iestyn 2d661fef18 Turns out we don't need to use SDL_SetWindowTitle on its own, since SDL_CreateWindow already deals with the window title anyway. So I've disabled everything related to Impl_SetWindowName for now 
Also what were you thinking Fury?!? window shouldn't be NULL for SDL_SetWindowTitle, you backwards person you
 2017-08-07 16:44:29 -04:00
Alam Ed Arias 35404be1e0 SDL: y input is flipped 2017-08-07 16:37:03 -04:00
Alam Ed Arias c25b2eb37f Merge remote-tracking branch 'origin/master' into SDL2_RelMouse 2017-08-07 16:33:39 -04:00
toasterbabe 780f9b1645 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into new_coop 
# Conflicts:
#	src/hardware/hw_md2.c
 2017-08-07 20:36:14 +01:00
Monster Iestyn 42ed41aeb1 Merge branch 'maces_but_better' into 'master' 
Maces but better

See merge request !103
 2017-08-07 15:27:05 -04:00
Monster Iestyn f3b7d2f89e Merge branch 'opengl-improvements' into 'master' 
OpenGL improvements

See merge request !99
 2017-08-07 15:06:16 -04:00
Monster Iestyn bcfd949dce Merge branch 'save-mode' into 'master' 
LF_SAVEGAME flag

See merge request !108
 2017-08-07 15:01:43 -04:00
toasterbabe 2e1b81b5da Woops, silly find and replace 2017-08-07 19:23:48 +01:00
Monster Iestyn 15db571757 Merge branch 'master' into opengl-improvements 2017-08-07 19:06:49 +01:00
toasterbabe d135f64464 Crash prevention 2017-08-07 18:58:41 +01:00
TehRealSalt a813506b8f Clean whitespace 2017-08-06 23:47:39 -04:00
TehRealSalt 042729bd8f AA i'm forgetting everything today 2017-08-06 17:09:25 -04:00
TehRealSalt 5c1aaf3906 Guess who forgot to press "Save All Files" in Notepad++ ^^; 2017-08-06 17:07:23 -04:00
TehRealSalt a5ca158622 LF_SAVEGAME flag instead of savemode 
Also always save on file creation
 2017-08-06 16:36:55 -04:00
TehRealSalt e24b8b917a Merge remote-tracking branch 'refs/remotes/origin/master' into save-mode 2017-08-06 01:19:33 -04:00
toasterbabe b51e80ef88 Make timer reset work in LF_NORELOAD as well. 2017-08-05 22:13:35 +01:00
toasterbabe 0a1e055ba1 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into new_coop 
# Conflicts:
#	src/m_menu.c
 2017-08-05 22:13:14 +01:00
Monster Iestyn 0ac63c0949 Merge branch 'lua-lump-load-only' into 'master' 
Lua lump load only

This branch prevents the following Lua functions from being used within hooks or coroutines, to prevent netgame desync problems or any other similar oddities when using these weirdly:

* `freeslot()`
* `addHook()`
* `hud.add()`
* `COM_AddCommand()`
* `CV_RegisterVar()`

All of the above should only be called when the Lua script is being loaded (i.e. it takes place the same instant a ".lua" file or a WAD file with a "LUA_" lump is being loaded)

To put it another way:
```
//This is valid usage:
freeslot("MT_TEST")

//This is NOT valid usage
addHook("MobjSpawn", function() freeslot("MT_TEST2") end, MT_PLAYER)

```

See *Monster Iestyn/Lua lump load only* on the FTP for an exe and test script.

See merge request !87
 2017-08-05 16:36:05 -04:00