MascaraSnake
|
8c345b87ca
|
Emblem and unlockable SOFTcoding! Emblems and unlockables are no longer predefined in the code and instead loaded from IWAD
|
2019-02-03 11:05:22 +01:00 |
|
Monster Iestyn
|
f3796dc7f6
|
revert to LF_SAVEGAME system code, removing all traces of saveoverride
(I believe Sal wanted us to do this anyway, so...)
|
2019-01-08 17:14:21 +00:00 |
|
mazmazz
|
075f28b7c8
|
WIP 20190101 merge
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
|
2019-01-02 01:09:15 -05:00 |
|
mazmazz
|
c2dc5788bf
|
Merge remote-tracking branch 'public-gl/next' into 2122-version
|
2018-12-24 17:30:59 -05:00 |
|
Monster Iestyn
|
31c6b6ef77
|
remove these unnecessary typedefs for assignments to variables that are actually already boolean to begin with, since the rhs resolves to a boolean anyway
|
2018-12-24 19:37:52 +00:00 |
|
Monster Iestyn
|
936b9ecebc
|
Fix disablespeedajdust in SOCs being set like an integer value instead of a boolean
|
2018-12-24 19:29:54 +00:00 |
|
Latapostrophe
|
b7d7472a88
|
Merge branch 'next' into SRB2-CHAT
|
2018-12-23 22:53:24 +01:00 |
|
Latapostrophe
|
1b61e15b1b
|
Merge branch 'master' into SRB2-CHAT
|
2018-12-23 10:26:08 +01:00 |
|
Digiku
|
bea76aa4bf
|
Merge branch 'save-override' into 'next'
Feature: Save override for level header
See merge request STJr/SRB2!392
|
2018-12-19 13:04:41 -05:00 |
|
TehRealSalt
|
9e596d15af
|
Save override for level header
Kind of like 2.2's, but with backwards-compatability with 2.1
|
2018-12-16 20:09:59 -05:00 |
|
TehRealSalt
|
cc22ef3f05
|
Add deprecation warning to admin
|
2018-12-16 16:05:18 -05:00 |
|
Latapostrophe
|
25e6d5388c
|
merge conflict
|
2018-12-16 16:48:15 +01:00 |
|
mazmazz
|
b84470ec51
|
Fix savegamename being improperly built due to missing null char after copying timeattackfolder
|
2018-12-13 12:01:07 -05:00 |
|
Monster Iestyn
|
33c1ac33f5
|
Merge branch 'next' into 21-version
# Conflicts:
# src/d_netcmd.c
|
2018-12-02 15:45:07 +00:00 |
|
TehRealSalt
|
c70cf5908d
|
IsPlayerAdmin support, since admin was removed
# Conflicts:
# src/lua_baselib.c
|
2018-11-29 07:12:15 -06:00 |
|
Wolfy
|
b8ce51bff2
|
Multiple admins
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
|
2018-11-29 06:46:59 -06:00 |
|
Monster Iestyn
|
1b2aea81dc
|
Merge branch 'master' into next
|
2018-11-25 20:39:17 +00:00 |
|
mazmazz
|
ea7162a76a
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
Digiku
|
9e75774fd2
|
Merge branch 'nights-ideyaspawn-dronebox' into 'master'
NiGHTS: Ideya Anchor Points
See merge request STJr/SRB2Internal!160
|
2018-11-21 21:03:29 -05:00 |
|
Digiku
|
c6bd1111e5
|
Merge branch 'nights-dronebox' into 'master'
NiGHTS: Drone hitbox improvements and player position correction on Nightserize
See merge request STJr/SRB2Internal!158
|
2018-11-21 20:19:39 -05:00 |
|
Monster Iestyn
|
224c0fccdb
|
Merge branch 'public_next'
# Conflicts:
# src/Makefile.cfg
# src/d_clisrv.c
# src/p_setup.c
# src/r_segs.c
# src/r_things.c
|
2018-11-20 14:33:10 +00:00 |
|
Monster Iestyn
|
66900c70ee
|
Merge branch 'master' into next
|
2018-11-20 13:55:36 +00:00 |
|
Alam Ed Arias
|
4e9fc881a2
|
Fix =sizeof-pointer-memaccess: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination?
|
2018-11-14 16:26:46 -05:00 |
|
Alam Ed Arias
|
d14f87b8c6
|
Cleanup whitespace
|
2018-11-14 10:54:33 -05:00 |
|
mazmazz
|
6c69dd1f78
|
Merge branch 'master' into text-prompts
|
2018-11-13 11:12:44 -05:00 |
|
Digiku
|
b6a0b2f1d9
|
Merge branch 'tutorial-time' into 'master'
Tutorial mode handling
See merge request STJr/SRB2Internal!201
|
2018-11-13 10:49:02 -05:00 |
|
Digiku
|
3ccfd57fba
|
Merge branch 'tracerangle' into 'master'
Line Exec 457, 458: Track mobj's angle to tracer; executes line tag if mobj faces away
See merge request STJr/SRB2Internal!198
|
2018-11-13 10:48:01 -05:00 |
|
mazmazz
|
c1c815ce6e
|
Compile errors
|
2018-11-13 10:31:06 -05:00 |
|
mazmazz
|
75c4a96e69
|
NextTag implementation
* Adjust named tag implementation to be more portable
* Next page adjustments
|
2018-11-13 00:13:36 -05:00 |
|
mazmazz
|
eb7718bfeb
|
PicToStart implementation; fix NumPrompts limitation error
|
2018-11-12 23:16:24 -05:00 |
|
mazmazz
|
a362407886
|
Merge branch 'control-selector' into text-prompts
|
2018-11-12 21:11:53 -05:00 |
|
mazmazz
|
ce7f168568
|
Fix PICSMETAPAGE
|
2018-11-11 14:50:10 -05:00 |
|
mazmazz
|
424bc557c2
|
Dehacked typos
|
2018-11-11 14:44:57 -05:00 |
|
mazmazz
|
c883b13b5d
|
Merge branch 'tutorial-time' into tutorial-time-firstprompt
|
2018-11-11 09:21:10 -05:00 |
|
Monster Iestyn
|
e4f157786c
|
Merge branch 'public_next'
# Conflicts:
# src/Makefile
# src/doomtype.h
# src/hardware/hw_clip.c
# src/hardware/hw_main.c
# src/sdl12/sdl_sound.c
|
2018-11-10 19:18:34 +00:00 |
|
Monster Iestyn
|
fced19d291
|
Merge branch 'master' into next
|
2018-11-10 19:05:33 +00:00 |
|
mazmazz
|
9a038b28e1
|
Implemented GFX for text prompts
* PicMode SOC
* PicToLoop SOC
|
2018-11-10 12:42:13 -05:00 |
|
Monster Iestyn
|
268bde3fdf
|
Merge branch 'public_next'
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/dehacked.c
# src/g_game.h
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/lua_baselib.c
# src/lua_hook.h
# src/lua_hooklib.c
# src/lua_hudlib.c
# src/lua_libs.h
# src/lua_maplib.c
# src/lua_script.c
# src/m_misc.h
# src/p_mobj.c
# src/s_sound.c
# src/sdl12/mixer_sound.c
# src/w_wad.c
|
2018-11-10 15:41:57 +00:00 |
|
mazmazz
|
3d9ce630d2
|
SOC for prompt gfx and music
|
2018-11-10 10:33:58 -05:00 |
|
mazmazz
|
a197c19742
|
Prompt page string field length adjustment; check empty named tag before prompt search
|
2018-11-10 09:38:32 -05:00 |
|
mazmazz
|
e1e94c3af2
|
Added page tags and find page by tag
* Added tutorial mode defines to this branch
|
2018-11-10 09:32:53 -05:00 |
|
mazmazz
|
7ac641450f
|
Text prompt Hide HUD dehacked
|
2018-11-09 23:50:25 -05:00 |
|
mazmazz
|
9ee894f777
|
Make gray/black text prompt backcolor darker in OpenGL
|
2018-11-09 22:52:13 -05:00 |
|
mazmazz
|
7daf5d4727
|
Set up separate background color for prompts vs. console
|
2018-11-09 22:38:55 -05:00 |
|
mazmazz
|
b8897db308
|
Fix crash when page text is empty; add checks for MAX_PROMPTS and MAX_PAGES
|
2018-11-09 21:55:14 -05:00 |
|
Monster Iestyn
|
d8f3a20e65
|
Merge branch 'Playerquit_hook' into 'next'
"PlayerQuit" Lua Hook
See merge request STJr/SRB2!127
|
2018-11-08 15:53:35 -05:00 |
|
Monster Iestyn
|
a9cfd6a781
|
Merge branch 'lua-slopes' into 'next'
Lua support for slopes
See merge request STJr/SRB2!307
|
2018-11-08 15:52:44 -05:00 |
|
Monster Iestyn
|
0bdbdd1b1e
|
Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)
|
2018-11-08 16:26:55 +00:00 |
|
GoldenTails
|
a3bc7ddfa0
|
Add Lua Ultimate Mode global variable so people can use it.
|
2018-11-06 18:09:45 -06:00 |
|
mazmazz
|
c16c59fd73
|
Support underscores -> spaces in TextPrompt name
|
2018-11-04 22:32:47 -05:00 |
|