Monster Iestyn
d4141ae230
Remove unused floorinfo_t struct and some unused vars in the hardware code
2017-08-19 18:51:56 +01:00
Monster Iestyn
9805b82fec
Disable "connect self" due to being broken, cleaned up ip+port part
...
Anyone know if "connect any" work at all? Would have disabled that too but apparently the game uses it if "-connect" is given with no params
2017-08-18 18:14:03 +01:00
Monster Iestyn
030c437186
Merge branch 'master' into mi-misc-whatever
2017-08-18 17:00:05 +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
toasterbabe
fd63db0aaf
Starting lives revamp, per the 2.2 priorities topic list!
...
* Each time you die, the number of game overs you've had is counted.
* Your save file updates to record this.
* The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game).
Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-18 00:58:16 +01:00
toasterbabe
2e6c09a636
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into directionchar
...
# Conflicts:
# src/hardware/hw_main.c
2017-08-16 21:40:32 +01: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
Nevur
4f8d53b329
Got rid of functions I added once but turned out to be unnecessary.
2017-08-11 15:46:46 +02: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
Nevur
8b64a6eef3
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement
2017-08-08 10:41:33 +02:00
Nevur
bb3365a904
We use srb2.pk3 instead.
2017-08-08 10:39:25 +02: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
Monster Iestyn
a0204c6722
Made P_SpecialStageDamage for the lose 10 rings damaging code shared by spikeballs and SS damage sector special
2017-08-06 22:10:29 +01: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
Monster Iestyn
34908c9b29
Re-order P_RemoveShield's first/second layer shield code
2017-08-06 18:57:02 +01: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
Monster Iestyn
15a1112218
Merge branch 'master' into opengl-improvements
2017-08-05 21:08:48 +01:00
Monster Iestyn
2e2b71da92
Merge branch 'addfile_menu' into 'master'
...
Add-ons menu
Does what it says on the tin! Very pretty. Would like help testing in filesystems that are not Windows, although I've recieved assurances from Sryder that since it's based on the same filesrch code, it should work cross-platform. Just want to confirm it works, though.
Also, M_* is whitelisted lumpname too.
root/!LatestSRB2Files/srb2win_branch_addfile.exe, requires new patch.dta.
See merge request !92
2017-08-05 16:05:12 -04:00
