stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-20 18:01:04 +00:00
Code Issues Projects Releases Packages Wiki Activity
7878 commits 172 branches 41 tags 280 MiB
Commit graph

6807 commits

Author SHA1 Message Date
RedEnchilada
ddd66b9eff Make A_SetObjectFlags only reset sector/bmap links if needed 2015-04-17 12:10:40 -05:00
Ronald Kinard
91934d5aec Merge branch 'next' into internal-master 
Synchronize the following MRs to internal:

 * STJr/SRB2!6
 * STJr/SRB2!8
 * STJr/SRB2!9
 * STJr/SRB2!10

Conflicts:
	src/doomdef.h
	src/p_map.c
 2015-04-14 19:33:38 -05:00
Furyhunter
f7c463418e Merge branch 'actual-blockmap-fix' into 'next' 
Actual blockmap fix

MI's "fix" was a reversion of something that allowed 2.0 maps to use the entire blockmap. This MR reverts that fix and adds a proper fix to the issue of west/south edges of the blockmap not working as they should. Tested with a thokbarrier-less square map (all sides were solid) and with AGZ (objects are tangible all around the map, like they are in 2.1.14).

See merge request !10
 2015-04-14 20:22:25 -04:00
Furyhunter
420c90fb48 Merge branch 'serverfix' into 'next' 
Re-fix the server global variable in Lua

I screwed up the conditions on my first attempt to fix this, since I only tested one scenario. Tested this in SP, at the main menu, and both clientside and (dedicated)serverside in MP. Everything works as intended.

See merge request !9
 2015-04-14 20:14:17 -04:00
Furyhunter
63089c885e Merge branch 'polyobject-more-fixes' into 'next' 
Polyobject more fixes

Extra fixes related to polyobjects; actually properly putting their flats alongside them in the draw list, and making them able to use single-waypoint zoom tube sequences. Also threw in a smoothness fix for swinging chains while I was there.

See merge request !8
 2015-04-14 20:13:16 -04:00
Furyhunter
3d59e337ac Merge branch 'polyobject-scroll-hotfix' into 'next' 
Polyobject scroll hotfix

Things fixed:

* Polyobjects should now carry the same thing types as conveyors (notable example; they'll now carry Crawlas when they wouldn't before)
* The drifting issue with players on spinning polyobjects should be fixed. (I swapped in the old bad hack for a new hack that should work like it's supposed to)

See merge request !6
 2015-04-14 20:10:07 -04:00
RedEnchilada
d2c74e1b13 Fix the west/south blockmap issue without fucking up huge maps 2015-04-08 21:32:07 -05:00
RedEnchilada
09345ce929 Revert "Guess what major breaking-news bug I just fixed B)" 
This reverts commit 9e306394dd.
Sorry MI, but this completely breaks large maps like AGZ.
 2015-04-08 20:50:49 -05:00
Wolfy
55bfb4ffe8 Re-fix the server global variable in Lua 2015-04-08 13:46:30 -04:00
RedEnchilada
210279625a Extra tiny logic fixes; swinging chains are smoother, and polyobjects can follow single-waypoint sequences 2015-04-06 11:23:08 -05:00
RedEnchilada
1078be3c30 Insert polyobject planes into their proper spot in the draw list; replace related hack with other hacks 2015-04-06 11:22:27 -05:00
JTE
4f06650a1e Removed the small velocity boost you get for surfacing from goo. 
This will prevent the goo from maintaining momentum for too long,
and shorten the amount of time before you stabilize on the surface.
 2015-04-04 18:39:32 -04:00
JTE
4016d15f7b Adjusted platform-creating velocity of goo water. 
Now it will only bounce ONCE when you jump on it, and Knuckles
just barely gets enough velocity out of his jump for even that.
This will leave players vulnerable and annoyed for a lot less
time while they wait to finish bouncing.
 2015-04-04 18:38:20 -04:00
RedEnchilada
5a4d9f885b Making RotateThings a bit nicer?? 2015-04-01 20:41:53 -05:00
RedEnchilada
6616b030bb Replace the old spinny polyobject player drifty hack thing with a new one that actually works 2015-04-01 18:15:46 -05:00
RedEnchilada
fb120299bb Make polyobjects carry the same objects as conveyors for consistency 2015-04-01 17:39:20 -05:00
Alam Ed Arias
83461f49c5 Merge branch 'public_todo_next' into next 
All commits that was in private that are not SRB2 2.2 had moved to public's next
 2015-04-01 12:32:34 -04:00
MonsterIestyn
9e306394dd Guess what major breaking-news bug I just fixed B) 
...

(It's that infamous intangible West/South linedefs bug, which was really a blockmap-related bug all along. AND IT WAS SO SIMPLE TO FIX!)

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9048 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:14 -04:00
RedEnchilada
bd5dcb0b0a Make sure lump name is zeroed out before writing so it always ends in a terminating char 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9047 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:14 -04:00
MonsterIestyn
a797e88bb9 Red's last commit should have been using "pgl", not "gl" for function name prefixes, so the compiler would be happy. Also, more simplicity in my camera code please! Simplified some of the checks for whether a camera should chase or not etc 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9046 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:14 -04:00
RedEnchilada
308a958653 yellow wanted me to push this cus it fixed md2 translucency for her test cases 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9045 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:14 -04:00
RedEnchilada
ada9b6a9ea I was helping yellow debug a crash and we found out this thing never actually fixed the crash like it was supposed to so it's fixed now -3- 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9044 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:14 -04:00
MonsterIestyn
076719e6a4 P_CheckSight should ideally be called AFTER most other things in things like P_LookForPlayers at least 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9043 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:13 -04:00
MonsterIestyn
d915a8142d Super skin colors are now available for use with mobj.color (but not player.skincolor, for obvious reasons), complete with the names for them (SKINCOLOR_SUPER1-5, TSUPERx, KSUPERx and MAXTRANSLATIONS to boot) 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9042 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:13 -04:00
MonsterIestyn
6cff0bba70 Base draw distances on viewx/viewy coordinates, NOT the player object's coordinates (this can cause problems with things like skyboxes for instance). Splitscreen's player 2 should not affect what sprites player 1 can see, and vice versa! Especially not for precipitation, that just looks ridiculous. 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9041 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:13 -04:00
MonsterIestyn
2d9d028bea Removed Lua's access to subsector/linedef validcounts and camera viewheight/startangle, since they are all useless for Lua purposes 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9040 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:13 -04:00
MonsterIestyn
4aa0b7a2a8 Fixed changing of player states with respect to vertical spring direction; only thing that should affect it is the player's own gravity. 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9038 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:13 -04:00
MonsterIestyn
34c396825f tmsprung is dead, long live MFE_SPRUNG a bunch of other painful tweaks to springs to fix this long-standing "AAA IM STUCK FOREVER UNDER A SPRING" thing when you touch a vertical spring from below (or above for reverse) 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9037 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:13 -04:00
MonsterIestyn
2480382b6b remove camera_t's "relativex" option from Lua stuff, it's unused anyway (todo: possibly remove said variable from existence altogether? Some disabled code still uses it though) 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9036 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:13 -04:00
MonsterIestyn
69f77a6c2e Not sure how these things work, but presumably this was meant to be here 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9029 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:13 -04:00
MonsterIestyn
c8c7878005 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! 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9009 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:13 -04:00
MonsterIestyn
474ad01b46 No more stupidity for No More Enemies special plz NME special now acts similarly to Each Time, checking all sectors sharing the same tag as itself for any enemies/bosses hiding within. This also supports cases where the tagged sectors are FOF control sectors. When the situation is asitsaysonthetin, NME acts like a normal trigger linedef should and executes all linedef execs around the sector it's located in. 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9005 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:12 -04:00
MonsterIestyn
af4c2fe391 Some minor cleanup for OpenGL sprite/MD2 code 2015-03-31 18:00:04 -04:00
MonsterIestyn
965bd2f694 Crawlas now use only one state for looking each 2015-03-31 17:56:06 -04:00
Ronald Kinard
2b826bd50c Merge branch 'next' into internal-master 
Synchronize for STJr/SRB2!5.
 2015-03-30 16:25:28 -05:00
RedEnchilada
70732f6475 Make solid midtexture trick work properly(?) for polyobjects 2015-03-30 13:06:04 -05:00
RedEnchilada
808775de02 Effect 4 on a map line now makes the front midtexture solid 
(Supports Effect 5 repeating of arbitrary lengths, but not of the automatic "top-to-bottom" type; just use Impassible there!)
 2015-03-29 00:49:27 -05:00
Ronald Kinard
a2af7ba305 Merge branch 'master' into next 
Synchronize with master for STJr/SRB2!4.
 2015-03-24 23:12:01 -05:00
Ronald Kinard
0e3ce03ca9 Merge branch 'master' into master-internal 
Synchronize with public master for STJr/SRB2!4.
 2015-03-24 23:07:03 -05:00
Ronald Kinard
53680903e5 Fix compilation and debugging on Windows. 
Core code has too many #define dependencies on interface-specific
defines. This means that it's currently not possible to safely
separate the core and interface code into different contexts. The
core code should be refactored to accomadate for this because we
should not have any interface-specific code in core in the first
place.

This reverts the static library SRB2Core from a7135094 and instead
adds the core sources to the SRB2SDL2 target directly.

So frustrating...
 2015-03-24 19:32:58 -05:00
Ronald Kinard
d407d280ad Merge branch 'next' into internal-master 
Synchronize STJr/SRB2!3
 2015-03-08 21:54:47 -05:00
Ronald Kinard
ad6535ca51 Merge branch 'master' into next 
Synchronizing STJr/SRB2!3
 2015-03-08 21:50:21 -05:00
Ronald Kinard
c43b41e183 Fix generation of SRB2DD target. 
It still won't compile correctly. But this should avoid the error
messages related to it.
 2015-03-08 04:30:07 -05:00
Ronald Kinard
8472075960 Prepend ASM sources with the current source directory in CMake. 
This fixes generation with USEASM enabled.
 2015-03-08 04:16:16 -05:00
Ronald Kinard
a713509493 Refactor CMake to allow source grouping and separation of interfaces. 
Core and SDL2 are two separate targets now. Core is a static library
that is linked into SRB2SDL2. The sources for both are separated.
When using an IDE like Visual Studio or Xcode, the source code
organized into groups that explain what that group of sources does.

In the future, "Main" could be split into a few more groups based on
file prefixes, but I think the way it is set up works for now.

Makefile targets are not affected by source_groups and typing `make`
will automatically compile both the "Core" library and SRB2SDL2
itself.
 2015-03-08 03:26:54 -05:00
Ronald Kinard
f28b050c07 Append current branch name to comp version string. 2015-03-04 20:15:57 -06:00
JTE
7964f3b044 Removed the need to add "Status = 1" to all new Character select entries for it to become active. 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9002 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-01 20:44:32 -05:00
JTE
c1bfde0027 Fixed WGL code "device mode" breaking. 
The devil is in the details.

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9001 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-01 20:44:32 -05:00
JTE
8d7b5941a8 Changed super colors to make them pulse instead of flash. Removed alt. supercolors from replay ghost stuff, because that's stupid. :/ 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8999 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-01 20:43:11 -05:00
JTE
092134ad0c Title screen cheat "devmode". 
Access the benefits of -debug, console devmode, and a complete gamedata.dat (all secrets unlocked) all in one go.
Moved "#if 0" and "#if 1" to "#ifdef DEVMODE" so the existance of this cheat and MD5 validation and all that can be toggled in one place too.

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8998 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-01 20:43:09 -05:00
MonsterIestyn
9b0e09877e gametype command now prints gametype NAMES instead of numbers. Even prints "Single player" when appropriate! 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8997 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-01 20:42:12 -05:00
JTE
0dff0d84de New HD SRB2 icon by VAdaPEga. 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8994 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-01 20:07:56 -05:00
Alam Ed Arias
82fc6fd4c0 whitespace cleanup 2015-03-01 19:38:42 -05:00
Wolfy
19b52d19cb Have super sparks scale with the player 
Fixes https://mb.srb2.org/showthread.php?t=40279

Should work fine, but do keep in mind that this fix is untested.
 2015-03-01 19:38:42 -05:00
MonsterIestyn
ffc1d3cb64 Correcting a most minor math mistake 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8992 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-01 19:38:00 -05:00
MonsterIestyn
2d8868feca Made HWR_InitMD2 and HWR_AddSpriteMD2/HWR_AddPlayerMD2 slightly less stupid with MD2-related searches in md2.dat: *Don't go barmy and search for a player skin called "THOK" when you already found the sprite called "THOK" beforehand! (or any other sprite prefix for that matter) *Don't make errors appear only for the last sprite/skin when it doesn't make sense to do so!! 
Todo: Stop the redundancy that currently goes on with adding MD2s on game start-up (note that HWR_AddSpriteMD2/HWR_AddPlayerMD2 are run for all sprites/skins BEFORE HWR_InitMD2 is called)

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8988 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-01 19:38:00 -05:00
Matt Walsh
f3e6770e9a Well that shows you how much we care about the old special stages *or* race! 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8985 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-01 19:38:00 -05:00
Matt Walsh
0a7f3751f6 Add in missing super check 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8984 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-01 19:38:00 -05:00
MonsterIestyn
8232dbca10 *Fixed OpenGL's handling of cv_translucency effects (should not remove shadows if off, but perhaps make them use default alpha?), someone was a bit hasty! *De-stupified the MD2 status checks regarding drawing of sprites - if they're already checked before calling HWR_DrawSprite, there's no point doing them WITHIN the function as well *Split off sprite shadow code into HWR_DrawSpriteShadow for convenience 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8983 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-01 19:38:00 -05:00
Alam Ed Arias
6513954789 whitespace cleanup 2015-03-01 19:30:22 -05:00
Wolfy
627889eec1 Have super sparks scale with the player 
Fixes https://mb.srb2.org/showthread.php?t=40279

Should work fine, but do keep in mind that this fix is untested.
 2015-03-01 19:28:57 -05:00
Ronald Kinard
967c2a324a Merge branch 'next' into internal-master 2015-03-01 02:21:07 -06:00
Ronald Kinard
15f0670c43 Merge branch 'fix_each_time' into next 
Conflicts:
	src/p_floor.c
 2015-03-01 02:13:46 -06:00
MonsterIestyn
0ab6710dfa Guess what major breaking-news bug I just fixed B) 
...

(It's that infamous intangible West/South linedefs bug, which was really a blockmap-related bug all along. AND IT WAS SO SIMPLE TO FIX!)

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9048 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:24 -06:00
RedEnchilada
8274b529d5 Make sure lump name is zeroed out before writing so it always ends in a terminating char 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9047 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:24 -06:00
MonsterIestyn
d818b7af50 Red's last commit should have been using "pgl", not "gl" for function name prefixes, so the compiler would be happy. Also, more simplicity in my camera code please! Simplified some of the checks for whether a camera should chase or not etc 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9046 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:23 -06:00
RedEnchilada
f6de5cc4d9 yellow wanted me to push this cus it fixed md2 translucency for her test cases 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9045 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:22 -06:00
RedEnchilada
a30222d8e6 I was helping yellow debug a crash and we found out this thing never actually fixed the crash like it was supposed to so it's fixed now -3- 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9044 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:22 -06:00
MonsterIestyn
643dc4cbaa P_CheckSight should ideally be called AFTER most other things in things like P_LookForPlayers at least 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9043 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:21 -06:00
MonsterIestyn
16b2dc3b54 Super skin colors are now available for use with mobj.color (but not player.skincolor, for obvious reasons), complete with the names for them (SKINCOLOR_SUPER1-5, TSUPERx, KSUPERx and MAXTRANSLATIONS to boot) 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9042 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:20 -06:00
MonsterIestyn
fb47b046da Base draw distances on viewx/viewy coordinates, NOT the player object's coordinates (this can cause problems with things like skyboxes for instance). Splitscreen's player 2 should not affect what sprites player 1 can see, and vice versa! Especially not for precipitation, that just looks ridiculous. 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9041 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:20 -06:00
MonsterIestyn
32bf550d08 Removed Lua's access to subsector/linedef validcounts and camera viewheight/startangle, since they are all useless for Lua purposes 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9040 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:19 -06:00
MonsterIestyn
e83fa3dc43 Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? 
Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:18 -06:00
MonsterIestyn
ff8c09922d Fixed changing of player states with respect to vertical spring direction; only thing that should affect it is the player's own gravity. 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9038 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:18 -06:00
MonsterIestyn
55c1ad4368 tmsprung is dead, long live MFE_SPRUNG a bunch of other painful tweaks to springs to fix this long-standing "AAA IM STUCK FOREVER UNDER A SPRING" thing when you touch a vertical spring from below (or above for reverse) 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9037 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:17 -06:00
MonsterIestyn
a486b70bed remove camera_t's "relativex" option from Lua stuff, it's unused anyway (todo: possibly remove said variable from existence altogether? Some disabled code still uses it though) 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9036 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:16 -06:00
MonsterIestyn
860a9172e4 Giving S_PLAY_DEAD A_Fall again so player death sequence doesn't break ...for now. 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9035 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:15 -06:00
MonsterIestyn
29b422ca10 Not sure how these things work, but presumably this was meant to be here 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9029 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:09:14 -06:00
Alam Ed Arias
51b783e85a cmake: Fixes to allow MSVC to compile 
running is another story

Author:    Ronald Kinard <furyhunter600@gmail.com>
Date:      Wed Jan 28 02:09:03 2015 -0600

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9013 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:07:18 -06:00
MonsterIestyn
234300d4b6 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! 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9009 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:03:03 -06:00
MonsterIestyn
06039bbd9b No more stupidity for No More Enemies special plz NME special now acts similarly to Each Time, checking all sectors sharing the same tag as itself for any enemies/bosses hiding within. This also supports cases where the tagged sectors are FOF control sectors. When the situation is asitsaysonthetin, NME acts like a normal trigger linedef should and executes all linedef execs around the sector it's located in. 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9005 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:03:02 -06:00
MonsterIestyn
c93ae69d9d Crawlas now use only one state for looking each SPR2_ constants added to dehacked.c for use in SOC/Lua (both "SPR2_RUN" and "SPR2_RUN_" are in theory the same thing in this implementation, likewise for other 3-char name cases) spr2names array/table also added for use in Lua - it works identically to Lua's sprnames, only with SPR2_ constants/string names instead Some minor cleanup for OpenGL sprite/MD2 code 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9004 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:03:01 -06:00
JTE
1d87f7d193 Removed default character select entries from hardcoding. 
Find them in MAINCFG in player.dta instead, where they belong. This means that player.dta finally contains ALL playable character-related data, with none of it in the iwad or exe.

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9003 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:03:00 -06:00
JTE
272d8e3f91 Removed the need to add "Status = 1" to all new Character select entries for it to become active. 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9002 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:02:59 -06:00
JTE
301f33f2b7 Fixed WGL code "device mode" breaking. 
The devil is in the details.

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9001 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:02:59 -06:00
MonsterIestyn
eef1406bd8 WARNING: I HAVE PROBABLY JUST BROKEN 3/4 OF THE GAME WITH THIS COMMIT PolyObject setup is now much simplified: First line alone spawns a PolyObject, PolyObject Params apply extra settings Disabled Explicitly Include Line for the meantime, since goodness knows how anyone's supposed to use that at all (let alone working properly) Starting translucencies from PO Params is stored for reference in netgames 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9000 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:02:58 -06:00
JTE
3a0f5fd2ae Changed super colors to make them pulse instead of flash. Removed alt. supercolors from replay ghost stuff, because that's stupid. :/ 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8999 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:02:57 -06:00
JTE
b29a3958e0 Title screen cheat "devmode". 
Access the benefits of -debug, console devmode, and a complete gamedata.dat (all secrets unlocked) all in one go.
Moved "#if 0" and "#if 1" to "#ifdef DEVMODE" so the existance of this cheat and MD5 validation and all that can be toggled in one place too.

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8998 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:02:56 -06:00
MonsterIestyn
ab78b722d5 gametype command now prints gametype NAMES instead of numbers. Even prints "Single player" when appropriate! 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8997 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:02:55 -06:00
JTE
2e8a5a3495 Updated dehacked.c to match info.h new player states. 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8996 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:02:54 -06:00
JTE
b7e3dfbd74 Updated version number to 2.2 and enabled active dev mode ("Trunk" versionstring and no MD5 checking on main wads) 
We're officially into 2.2 development now, yay! \o/

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8995 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 02:02:54 -06:00
JTE
bfbd326821 New HD SRB2 icon by VAdaPEga. 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8994 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 01:59:38 -06:00
JTE
b2681984a6 Merge branch 'player-animations' 
SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible.

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 01:59:38 -06:00
MonsterIestyn
c15153053c Correcting a most minor math mistake 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8992 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 01:59:37 -06:00
MonsterIestyn
93734b6d60 Made HWR_InitMD2 and HWR_AddSpriteMD2/HWR_AddPlayerMD2 slightly less stupid with MD2-related searches in md2.dat: *Don't go barmy and search for a player skin called "THOK" when you already found the sprite called "THOK" beforehand! (or any other sprite prefix for that matter) *Don't make errors appear only for the last sprite/skin when it doesn't make sense to do so!! 
Todo: Stop the redundancy that currently goes on with adding MD2s on game start-up (note that HWR_AddSpriteMD2/HWR_AddPlayerMD2 are run for all sprites/skins BEFORE HWR_InitMD2 is called)

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8988 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 01:59:36 -06:00
Matt Walsh
58516ebe10 Well that shows you how much we care about the old special stages *or* race! 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8985 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 01:59:35 -06:00
Matt Walsh
389299230d Add in missing super check 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8984 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 01:59:35 -06:00
MonsterIestyn
5d1ef1ff31 *Fixed OpenGL's handling of cv_translucency effects (should not remove shadows if off, but perhaps make them use default alpha?), someone was a bit hasty! *De-stupified the MD2 status checks regarding drawing of sprites - if they're already checked before calling HWR_DrawSprite, there's no point doing them WITHIN the function as well *Split off sprite shadow code into HWR_DrawSpriteShadow for convenience 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8983 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-02-24 01:59:34 -06:00
Alam Ed Arias
2609745b51 it was me, Duo! 2015-02-06 10:22:16 -05:00
Alam Ed Arias
ed0d70feca do not typedef off_t when we do not need to 2015-02-05 17:32:27 -05:00
Alam Ed Arias
542295c863 remove comptime.h from cmake file list 2015-02-05 17:32:26 -05:00
Ronald Kinard
062a746fdd Further fix IPv4 when IPv6 is available 2015-02-05 15:36:07 -06:00
Ronald Kinard
ae05613460 Fix IPv4 connectivity when IPv6 is enabled 2015-02-05 00:32:54 -06:00
Alam Ed Arias
3d498fe894 VERSIONSTRINGW is funny 2015-02-02 15:21:58 -05:00
Alam Ed Arias
7cf1a1aab8 fixup cmake merge 2015-02-02 14:58:51 -05:00
Ronald Kinard
e08bd45227 cmake: Separate debug symbols on gcc 
Only when actually making the debug target though!
 2015-02-01 22:14:52 -06:00
Ronald Kinard
d7015d1492 cmake: Fix nasm/add yasm support 
Tested to work on MSVC, mingw-gcc
 2015-02-01 21:25:02 -06:00
Ronald Kinard
194ce626e1 cmake: Add nasm support 
Enables ASM-NASM and adds tmap*.nas to sdl target.

No idea if this actually works.
 2015-02-01 19:18:25 -06:00
Ronald Kinard
8d3b948e1b cmake: Fix compilation for MSVC 2015 
snprintf is now available in MSVC 2015!
 2015-02-01 19:02:08 -06:00
Ronald Kinard
ec79756c42 cmake: copy DLLs to build directory in MSVC 
this is done as a POST_BUILD step
 2015-01-31 22:40:36 -06:00
Ronald Kinard
4d3a7dd8fb cmake: fix NDEBUG on Debug 
wow i'm stupid
 2015-01-29 00:17:47 -06:00
Ronald Kinard
70f046a320 cmake: on mac, check Resources in bundle first. 
on non debug, check assets folder in src as well
 2015-01-28 23:38:40 -06:00
Ronald Kinard
e54338ef01 cmake: fix Windows linking 2015-01-28 23:20:21 -06:00
Ronald Kinard
57037e4124 cmake: fixes to enable linux compilation 
string.c, capitalization, find fixes
 2015-01-28 20:15:24 +00:00
Ronald Kinard
68f8a5b0f9 cmake: build bundle and dmg on install/package 2015-01-28 19:29:16 -06:00
Ronald Kinard
0909fce2e3 cmake: Configure source via cmake 
silently fixing a bad malloc here too shhhhhhhhh
 2015-01-28 18:03:41 -06:00
Ronald Kinard
53799eb390 cmake: Add CPack Package Generation 
Generates zips only at the moment
 2015-01-28 16:42:05 -06:00
Ronald Kinard
1c9de50ad2 cmake: Search SDL2_main separately for MSVC 2015-01-28 15:33:29 -06:00
Ronald Kinard
20d6a7e675 cmake: exe icon on windows 2015-01-28 02:12:14 -06:00
Ronald Kinard
2f1367aab6 cmake: Fixes to allow MSVC to compile 
running is another story
 2015-01-28 02:09:03 -06:00
Ronald Kinard
495ea65cc5 Add GME and SDL2_mixer 
Also support dynamic/static opengl switching
 2015-01-28 01:20:43 -06:00
Ronald Kinard
479ebc3f94 Add Xcode target support 
It is really messy at the moment. There is no support for copying the
necessary frameworks and dylibs out to the bundle for distribution, and
it is a frankenstein of manual find_library and find_package which can
sometimes pick up Homebrew dylibs.
 2015-01-28 00:58:30 -06:00
Ronald Kinard
05f5ec664a Initial CMake support pass 
Compiles the SDL2 target on Windows successfully
 2015-01-27 23:46:39 -06:00
Alam Ed Arias
45e8ec34a6 always turn on LFS support when compiling for a Linux/GNU system with libpng support 2015-01-10 17:35:36 -05:00
Alam Ed Arias
e28882a56d oh, nPlaneVerts is a size_t?, well, then we need to use sizeu#() 2015-01-10 17:27:24 -05:00
Alam Ed Arias
f5cd1d5ebc add check on write failed in old TGA screenshot code 2015-01-10 17:26:29 -05:00
Alam Arias
0c106a4ccc I await the rise of AltimitOS because seriously, fuck this nonsense 2015-01-09 23:56:00 -05:00
Alam Arias
8bee6bef59 Make sure clear_conditionsets feeds in 1 to MAXCONDITIONSETS instead of 0 to MAXCONDITIONSETS-1, so that M_ClearConditionSet can use them all properly AND clear all condition sets properly. 
Apparently the mistake also caused myargc to be cleared in Linux64 SDL2 (as pointed out by that ilag11111 guy on GitHub), so that should be fixed now too.
 2015-01-09 23:55:56 -05:00
Alam Arias
7535bb261f Account for the separation of F11 and F12 in the keycodes list 2015-01-09 23:55:52 -05:00
Alam Ed Arias
73b3287b19 SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00
Alam Ed Arias
d959d0e462 Merge remote-tracking branch 'wolfy852/patch-2' into next 2014-11-29 13:08:32 -05:00
Ronald Kinard
54f0d0c110 IN PROGRESS: porting eternity slopes from srb2cb 2014-11-18 18:45:57 -06:00
Sryder13
3f1bb6359f Merge remote-tracking branch 'upstream/master' 2014-11-14 22:21:07 +00:00
Sryder13
e90286ae52 Fix the polyobject crash 2014-11-14 22:19:44 +00:00
Ronald Kinard
3fd2a705ee Maybe this is the last warning related commit? 2014-11-14 00:04:54 -06:00
Ronald Kinard
98c3c3a3ae More warning squashing 2014-11-13 23:09:57 -06:00
Ronald Kinard
3eafca0dc1 Fix compile errors on win32, warnings elsewhere 2014-11-13 22:58:08 -06:00
Ronald Kinard
2feda0b560 Fix second joystick in sdl 2014-11-13 22:34:47 -06:00
Ronald Kinard
be1565fce3 Add support for new HWR functions in win32 and sdl12 2014-11-13 22:34:09 -06:00
Ronald Kinard
869c4241eb Restrict mouse to window when in focus 2014-11-13 19:18:24 -06:00
Ronald Kinard
d056e82b3b Parse GL version correctly. 2014-11-13 18:20:32 -06:00
Ronald Kinard
d8484a86e0 Virtual resolutions in OpenGL 
Also made fades use core functions if they are available.
 2014-11-13 18:06:38 -06:00
Ronald Kinard
5d0eafb26a Fix MOUSE4/MOUSE5 
MOUSE6-8 will not be supported on SDL2 as there is no interface for them.
 2014-11-13 15:31:32 -06:00
Ronald Kinard
80891e916d Use scancodes instead of keycodes for locale independence. 
ONLY US KEYBOARDS SUPPORTED! THAT'S HOW WE DO IT IN AMURRICA
 2014-11-13 15:19:39 -06:00
Ronald Kinard
0913bd44af Fix mouse warping 
In some cases, the warp back to center was being detected as a mouse motion, causing all sorts of silliness with the mouse. The workaround is by only using the first motion event and ignoring every event after that, until the next call to I_GetEvent.
 2014-11-13 03:51:33 -06:00
Ronald Kinard
b82f64dea5 Display error window on crash 2014-11-13 01:51:29 -06:00
Ronald Kinard
4c55b5db20 Center only on display 1. No more multimonitor span. 2014-11-13 01:36:06 -06:00
Ronald Kinard
b7e8d7d044 Fix -nomouse 2014-11-13 01:04:17 -06:00
Alam Ed Arias
a721528c50 DunceEnchilada had been glared at 2014-11-12 09:28:14 -05:00
Alam Ed Arias
404b5f666c SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
Alam Ed Arias
3fe4921a24 Merge remote-tracking branch 'origin/master' into next 2014-11-02 01:12:23 -05:00
Alam Ed Arias
6d773c54a5 Use OpenGL 1.3 in static builds and on SDL interfaces 2014-11-02 01:11:59 -05:00
Alam Ed Arias
be73e84245 Merge remote-tracking branch 'origin/master' into next 2014-11-02 01:32:33 -04:00
JTE
9d1da548aa Fix hardware / r_opengl warnings. 2014-11-02 01:31:38 -04:00
Alam Ed Arias
aa612bcf91 whiteline checkup 2014-11-02 01:31:36 -04:00
Sryder13
0c0ede6f18 OpenGL: Polyobject Planes 2014-10-27 20:57:45 +00:00
ilag11111
97b61eb66d Each Time Fix Fix: Don't infinite loop when each time is set to trigger on exit. 2014-10-02 10:26:12 -07:00
Wolfy
197e5fce55 Change super transformation to freeze momentum instead of bitshifting 
Fixes https://mb.srb2.org/showthread.php?t=39921 where the issue before was that when you transformed your momentum would still have you moving slowly, which could cancel out the animation.
 2014-10-01 21:19:32 -05:00
ilag11111
2191e5b9de Each Time Fix: Multiple players simultaneously entering a sector, e.g. Tails carries one in. 2014-10-01 13:49:44 -07:00
Sryder13
1ab29ba96a Merge remote-tracking branch 'upstream/master' 2014-09-12 20:53:55 +01:00
Sryder13
781dd16fa6 Fix THOK MD2's not rotating with camera 
Will also fix any other case that an mobj has a skin and a single frame.
 2014-09-10 00:22:39 +01:00
Sryder13
987f9f5c26 Quick sky fix 2 
walls not extending down when a thok barrier has top textures and both
ceilings have sky.
 2014-09-09 23:57:12 +01:00
Sryder13
cee8fff7b3 Quick sky fix 
Avoid Z-Fighting on the depth wall with the regular walls to stop the
possibility of regular walls being made partially invisible.
 2014-09-09 01:59:19 +01:00
Sryder13
b2852ec0f4 OpenGL: Sky culling 
Gets rid of stuff being drawn where the sky should be being drawn.
 2014-09-08 23:29:05 +01:00
Sryder13
bc0b5505a8 OpenGL: Fix sky drawing 
sky positioning and scaling more correct compared to software.
 2014-09-08 00:55:32 +01:00
Alam Ed Arias
dc6f798a43 Merge remote-tracking branch 'origin/master' into next 2014-09-05 20:26:07 -04:00
Ronald Kinard
5b07cf8ff0 SDL2: Add 1600x1200 mode 2014-09-05 20:25:06 -04:00
Ronald Kinard
399eddefe6 SDL2: Do not use xinput, force directinput 
Fixes axes issue with xinput controllers.
 2014-09-05 20:24:57 -04:00
Ronald Kinard
31abd19f75 SDL2: Reimplement some stubbed commands 
Also remove some unnecessary functions.
 2014-09-05 20:24:39 -04:00
Ronald Kinard
eece38609e SDL2: Fix 320x200 mode 2014-09-05 20:24:25 -04:00
Ronald Kinard
c97eef238e Use gcc_struct on ATTRPACK too 2014-09-05 20:23:38 -04:00
Wolfy
8a4ec56ef5 Merge the dedicatedserver and server global variables 
Previously in Lua, dedicatedserver would only return true if the player running the script was the one hosting the dedicated server. In all other cases, it would return nil. This fixes it to point to the server host no matter what.
 2014-09-05 20:23:32 -04:00
Sryder13
ca0f0bf2fd OpenGL Fade masks 
I think I've done this all right, someone correct me if I haven't.
 2014-09-04 01:35:29 +01:00
Sryder13
da2b6f2c01 Fix certain textures with holes in 
see: CEZ1 skybox in linear filtermodes.
 2014-09-03 02:10:47 +01:00
Sryder13
d96eaa768c else added 
less redundancy.
 2014-08-30 14:36:18 +01:00
Sryder13
ae27ace7fe Polyobject translucency quick fix. 
I realise what I did before may cause FOF's in the same sector to not be
drawn, if they were before.
 2014-08-30 14:20:07 +01:00
Sryder13
278f2e9b66 Polyobject top/bottom texture + translucency 
polyobjects do have top/bottom textures, silly.
And translucency.
 2014-08-30 14:10:55 +01:00
Alam Ed Arias
b1e1163b91 evil changes 2014-08-27 22:43:10 -04:00
Alam Ed Arias
7cb77075d1 SRB2 2.1.11 release 2014-08-26 23:56:30 -04:00
Alam Arias
81cbdcccd5 Merge pull request #28 from wolfy852/master 
Remove momentum reduction in CA_JUMPTHOK
 2014-08-26 21:29:24 -04:00
Alam Ed Arias
d6c29e19ab SRB2 2.1.10 release 2014-08-05 19:59:40 -04:00
Wolfy
53c791b29c Remove momentum reduction in CA_JUMPTHOK 
Also add new multiability handling for it
 2014-08-04 13:38:19 -05:00
Alam Ed Arias
d066a7a6d1 Change mixer panning to make sense (for SDL12) 
This makes positional audio in sdl work correctly (things to the left
    play sounds in the left speaker)
 2014-08-04 11:57:29 -04:00
Ronald Kinard
8eef7239b2 Change mixer panning to make sense 
This makes positional audio in sdl work correctly (things to the left
play sounds in the left speaker)
 2014-08-04 02:48:18 -05:00
Ronald Kinard
25739b38e3 INTERFACE=sdl 2014-08-04 00:27:12 -05:00
Ronald Kinard
a0f959e597 Fix Makefile to target sdl correctly 2014-08-04 00:04:03 -05:00
Alam Ed Arias
c028c83235 SRB2 2.1.9 release 2014-08-03 23:49:33 -04:00
Alam Ed Arias
ab9934932e Merge branch 'master' into next 2014-08-03 23:41:57 -04:00
Alam Ed Arias
0386516946 Merge remote-tracking branch 'Furyhunter/sdl2' 2014-08-03 21:02:24 -04:00
Alam Ed Arias
e2d3ce1aed keep the old SDL interface 2014-08-03 21:02:04 -04:00
Alam Ed Arias
13f3fbac2e Merge branch 'master' into next 2014-08-02 11:11:09 -04:00
Alam Ed Arias
cd97685e5a fix build for sh sheel 2014-08-02 11:10:00 -04:00
Alam Ed Arias
abce10fd65 Merge branch 'master' into next 2014-07-29 15:53:53 -04:00
Alam Ed Arias
d8eceeb0ac add build is done message into Makefile 2014-07-29 14:14:59 -04:00
Ronald Kinard
03fe3bdad2 Replace sdl with sdl2 
SDL1.2 is dead, long live SDL
 2014-07-26 02:06:00 -05:00
Ronald Kinard
87df25a58c sdl2: Fallback resolution for gl fullscreen 
to avoid a crash
 2014-07-26 00:56:30 -05:00
Ronald Kinard
3a1a0c8871 sdl2: fix mouse grabbing in windowed 
Should now ignore all motion events and not warp the mouse when the
window is out of focus.
 2014-07-25 23:47:14 -05:00
Ronald Kinard
1bfea632c9 sdl2: windows exe rename srb2sdl2.exe 2014-07-25 23:08:37 -05:00
Ronald Kinard
e3c7bc0637 sdl2: Slow the mouse a bit 
Fixes Furyhunter/SRB2#1 but probably makes mouse speed too slow on
Linux. Whatever.
 2014-07-25 22:55:48 -05:00
Alam Ed Arias
424d6531c9 Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2 2014-07-25 20:00:46 -04:00
Alam Ed Arias
d438a8f8c2 doh, I forget one, and in SDL2's Makefile.cfg 2014-07-25 19:44:43 -04:00
Alam Ed Arias
f03e591f64 change SDL into HAVE_SDL 2014-07-25 19:10:24 -04:00
Ronald Kinard
b429cce3b6 sdl2: add -borderless option for windowed 2014-07-24 22:35:04 -05:00
Ronald Kinard
ce8d82aa52 sdl2: oops it should be 32 bpp in softblit 2014-07-24 21:46:35 -05:00
Ronald Kinard
93e00cc694 sdl2: -softblit, use smaller texture format 
-softblit uses SDL2 software renderer backend for blitting
 2014-07-24 21:32:47 -05:00
Ronald Kinard
8b0f374bfe sdl2: potential huge perf. boost to software 
SDL_UpdateTexture is apparently not good for streaming textures.
So instead, I did SDL_LockTexture/Unlock.
 2014-07-24 19:18:48 -05:00
Ronald Kinard
005b502756 sdl2: limit fullscreen resolution in OpenGL 2014-07-24 03:15:35 -05:00
Ronald Kinard
8890722223 sdl2: handle no AF support correctly (1, not 0) 
GL_EXT_texture_filter_anisotropic is cool I guess
 2014-07-24 03:03:41 -05:00
Ronald Kinard
39603487ec sdl2: restore anisotropic filtering support in gl 2014-07-24 03:01:16 -05:00
Ronald Kinard
716aa1f33a sdl2: fix mouse motion (remove -mousewarp) 2014-07-24 02:51:46 -05:00
Ronald Kinard
0d82e3b54b sdl2: reorder graphics initialization 
GL Initialization needs to happen before window creation,
otherwise the GL library will get reloaded while in use and
Windows will have a heart attack. This is bad, obviously.
 2014-07-24 00:20:34 -05:00
Ronald Kinard
4433be194f sdl2: software: clear window on mode change 2014-07-23 23:21:19 -05:00
Ronald Kinard
73e99fa96c sdl2: I_Error if we can't create gl context 2014-07-23 23:15:31 -05:00
Ronald Kinard
fc075e4c81 sdl2: use ABGR8888 texture on little endian system 
This is a massive performance boost on slow processors, because
before, the intermediary buffer had to be swizzled to ABGR8888
before being uploaded -- for large resolutions this was an
enormous performance penalty.
 2014-07-23 23:02:21 -05:00
Ronald Kinard
345b59f6f5 sdl2: code cleanup 2014-07-23 21:45:36 -05:00
Alam Ed Arias
a103697dd0 isFullscreen is unused? 2014-07-23 22:05:03 -04:00
Alam Ed Arias
1a731fb463 there no fade for non mixer builds 2014-07-23 22:04:46 -04:00
Ronald Kinard
9a4b2bd360 sdl2: restore vsync option (use sdl swap interval) 2014-07-23 19:46:12 -05:00
Ronald Kinard
20f871bd84 sdl2: opengl compiles fine, no TESTHW=1 needed 2014-07-23 19:43:15 -05:00
Ronald Kinard
d078e3e17f sdl2: fix opengl (almost) entirely 2014-07-23 19:39:41 -05:00
Ronald Kinard
fea559398a sdl2: we have colored rects in gl now I guess 2014-07-22 02:23:51 -05:00
Ronald Kinard
0a37bdf76d sdl2: start getting opengl working again 2014-07-22 01:23:08 -05:00
Ronald Kinard
145618785c sdl2: reuse window on mode change 2014-07-21 22:41:01 -05:00
Ronald Kinard
2618b1dd0b sdl2: truncate resolution list, add 16:9 hdtv modes 2014-07-21 22:16:34 -05:00
Ronald Kinard
1ac1d04cca sdl2: joystick fixes. don't pause in demo play/rec 2014-07-21 21:32:18 -05:00
wolfy852
9ab60d1295 Add LUA_EvalMath to Lua with function name EvalMath 2014-07-19 17:46:53 -05:00
wolfy852
d6b466b7dd Add skin flag for running on water 2014-07-05 03:23:49 -05:00
wolfy852
39ce16a468 Add the Jump Thok ability for use by custom characters 2014-07-05 02:50:07 -05:00
Alam Ed Arias
c130be77b1 Merge remote-tracking branch 'RedEnchilada/next' into next 
Also clean up whitespaces
 2014-06-19 13:00:36 -04:00
RedEnchilada
37d3780458 Add hook for chat messages, including csays 2014-06-18 15:28:09 -05:00
Alam Ed Arias
b520d61ba2 Merge branch 'master' into sdl2 2014-05-27 15:19:18 -04:00
Alam Ed Arias
15f976a06c Merge branch 'master' into next 2014-05-27 15:19:08 -04:00
Alam Ed Arias
b511294749 Merge remote-tracking branch 'Sryder13/master' 2014-05-27 15:14:55 -04:00
wolfy852
a8f5406233 Add P_Telekinesis and P_IsFlagAtBase to Lua. 2014-05-25 21:41:05 -05:00
Wolfy
9987d132fb Add P_DoSpring to base library. 2014-05-24 12:51:59 -04:00
Wolfy
f509c56e3c Unstatic P_DoSpring. 2014-05-24 12:49:15 -04:00
Wolfy
5316f8da96 Add P_SpawnSpinMobj to base library. 2014-05-24 12:46:46 -04:00
Wolfy
3f1038dcbe Unstatic P_SpawnSpinMobj. 2014-05-24 12:46:10 -04:00
Wolfy
ec443af3d9 Add P_SpawnThokMobj to Lua base library. 
I don't know too much about this but I THINK I did it right.
 2014-05-24 12:35:01 -04:00
Wolfy
ed82755b6d Unstatic P_SpawnThokMobj. 2014-05-24 12:30:33 -04:00
ilag
d8234f408b Ensures the force shield's movecount is correctly set before comparing 2014-05-15 11:36:17 -07:00
ilag11111
aafc0bcb0d Ensures that the force shield's sprite returns to the proper state after receiving an invincibility monitor. 
Fixes http://mb.srb2.org/showthread.php?p=752815
 2014-05-14 16:27:37 -07:00
Alam Ed Arias
d597856c8f Merge branch 'master' into sdl2 2014-05-02 21:32:31 -04:00
ilag
1af18c7013 Redo all changes I ended up losing trying to undo the mess I made. 
Also, fix the issue pointed out by Alam.
 2014-05-02 14:24:20 -07:00
Alam Ed Arias
0f8269fe6f merge sdl interface changes into SDL2 interface 2014-05-02 09:33:57 -04:00
Alam Ed Arias
f3bd8c6ef4 Merge branch 'master' into sdl2 2014-05-02 09:01:51 -04:00
Alam Ed Arias
ea7abe7c44 Merge branch 'master' of https://github.com/ilag11111/SRB2 2014-05-02 08:49:30 -04:00
ilag11111
b21d5c55c9 Uses fixed-point math to properly calculate the exact amount of space needed. 2014-04-25 13:17:05 -07:00
ilag11111
f7bbf8c6d0 Improved fix by changing the formula for how memory is allocated to arbitrary sample rate conversion. 2014-04-25 12:42:43 -07:00
ilag11111
60a115b0a7 Fix (Linux) 64-bit crash in CEZ3 (playback of sfx_litng3). 2014-04-25 00:37:13 -07:00
Dmitry Marakasov
7d52913add Make endianess detection more flexible 
And fix it on FreeBSD, where _BIG_ENDIAN is not a flag indicating
big endian machine, but a constant to compare _BYTE_ORDER to.
 2014-04-25 02:40:19 +04:00
Sryder13
c5aa433167 Merge remote-tracking branch 'upstream/master' 2014-04-24 15:37:07 +01:00
Alam Ed Arias
5b5fbe9aad fix suport for libpng 1.6 2014-04-21 23:07:02 -04:00
Sryder13
46e84465e8 OpenGL: FOF Cutting Fix 2 
Fixes Translucent FOF's cutting Solid FOF's.
 2014-04-20 10:35:50 +01:00
Sryder13
a230368c3d Merge remote-tracking branch 'upstream/master' 2014-04-20 10:33:47 +01:00
Alam Ed Arias
26d2d37d31 Merge branch 'master' into sdl2 2014-04-19 13:42:23 -04:00
Alam Ed Arias
8a9759a3e4 SRB2 2.1.8 release 2014-04-19 13:41:29 -04:00
Sryder13
bae7b5b2ac OpenGL: FOF cutting fix 
Fixes any FOF's with FF_SOLID not cutting each other.
 2014-04-19 17:21:30 +01:00
Alam Ed Arias
f3e8c01565 Update interfaces I_UpdateMumble function 2014-04-18 11:16:18 -04:00
Alam Ed Arias
a4919454e8 Merge branch 'master' into sdl2 2014-04-17 20:46:35 -04:00
Alam Arias
7fb530fd18 grr, shadows 2014-04-17 17:52:33 -04:00
Alam Ed Arias
d6e48e2168 whitespace cleanup 2014-04-17 17:47:51 -04:00
RedEnchilada
fa79c1856c Make player seethru code account for cut-away view 2014-04-17 13:46:40 -05:00
Alam Ed Arias
cb9f07fae8 Merge branch 'master' into sdl2 2014-04-17 14:04:02 -04:00
Alam Ed Arias
65c75f413c SDL2: disable hardware support by default for now 2014-04-17 14:02:51 -04:00
Sryder13
098eb28036 OpenGL Multi-Property FOF's 
Multi-Property FOF's have their multiple side properties display in
OpenGL.
 2014-04-17 13:02:34 +01:00
Sryder13
5b324924ff Undo MD2 Spin Frame Interpolation 
Because apparently people don't like them like that.
 2014-04-17 11:57:10 +01:00
Alam Ed Arias
537ad47d00 Will the real 2.1.7 release please stand up? 2014-04-15 22:20:13 -04:00
Alam Ed Arias
6b3a982434 Merge branch 'master' into sdl2 2014-04-15 13:57:39 -04:00
RedEnchilada
766f4c4acb Render skybox from proper place for cutaway view 
(Disclaimer: I don't know C at all)
 2014-04-15 12:39:23 -05:00
Alam Ed Arias
8b90b0c39e Merge branch 'master' into sdl2 2014-04-14 01:16:06 -04:00
Alam Ed Arias
02a3b0776c SRB2 2.1.7 release 2014-04-14 01:14:58 -04:00
Alam Ed Arias
8fea599bf8 disable x11 check 2014-04-09 19:55:05 -04:00
Alam Ed Arias
2005421a7e Merge remote-tracking branch 'ilag11111/sdl2' into sdl2 
Conflicts:
	src/sdl2/i_video.c
 2014-04-09 19:47:11 -04:00
ilag11111
c206d55568 Adds command line parameter -mousewarp to control the use of warping in place of grabbing. Works around bugs in certain versions of X. 2014-04-09 14:40:54 -07:00
Alam Ed Arias
a3f387200e XINPUT2 support check 
reable check for x11 and check if XINPUT2 support before enable mouse grab mode
TODO: need to restore non-mousegrab code?
 2014-04-09 14:57:47 -04:00
Alam Ed Arias
57c1fd602c clean up SDL2 video interface code 2014-04-09 14:54:15 -04:00
Alam Ed Arias
0aaaf067e3 update SDL2 interface to use SDL_JoystickNameForIndex 2014-04-09 14:54:15 -04:00
Alam Ed Arias
c59df51d19 Merge branch 'master' into sdl2 
Conflicts:
	comptime.sh
 2014-04-09 14:54:06 -04:00
Alam Ed Arias
2bd6573f5f grsoftwarefog is still hardware only 2014-04-09 14:52:38 -04:00
ilag11111
025523f3e3 Fix the previous commit to work on Linux32. Add more comments. 2014-04-08 19:19:23 -07:00
ilag11111
0306c1834a Disables input grabbing in Linux; allows alt-tabbing and other actions. 2014-04-08 19:02:45 -07:00
Alam Ed Arias
cec63aa4c0 restore ISO C90 support in r_opengl 2014-04-08 12:01:26 -04:00
Sryder13
b63e99efd8 OpenGL Screen Flip 
Screen flipping in OpenGL is no longer done by inverting the screen
polygons.
 2014-04-07 17:08:04 +01:00
Sryder13
81627a847f Merge https://github.com/STJr/SRB2 2014-04-07 17:01:56 +01:00
Alam Ed Arias
25448dec36 Compile Win32 EXE with -gdwarf-2 2014-04-07 10:03:14 -04:00
Sryder13
7e04e679a9 Player Spin Frame MD2 Interpolation 
Player spin frames on MD2's interpolate correctly when moving slowly.
 2014-04-07 12:37:15 +01:00
Ronald Kinard
ec559c84c1 sdl2: Fix mouse motion in fullscreen 2014-04-06 22:36:47 -05:00
Ronald Kinard
1882cf9233 sdl2: fix tabbing on last few commits 2014-04-06 21:50:56 -05:00
Ronald Kinard
080f8e4008 sdl2: restore joystick code 
remarkably it still works even though the API has changed.
 2014-04-06 21:43:40 -05:00
Ronald Kinard
6ea03a23b4 sdl2: Revert -win flag behavior, was glitchy 2014-04-06 21:23:59 -05:00
Alam Ed Arias
0ae6d5ae29 merge sdl interface changes into SDL2 interface 2014-04-06 19:01:04 -04:00
Alam Ed Arias
ea2e1a1144 Merge branch 'master' into sdl2 2014-04-06 18:38:04 -04:00
Sryder13
56fbdfdad3 OpenGL Translucent Midtexture Fix 
Translucent Midtextures using holes with textures in them now work when
there is no FOF's above their sector.
 2014-04-05 22:13:09 +01:00
Sryder13
fc12fc7cd4 OpenGL Screen Fading Fix 
Screen Wipes now work as they did in 2.0.x.
 2014-03-31 23:47:12 +01:00
Sryder13
d75d7cd09a OpenGL Splitscreen Fix 
First screen in split-screen is now not completely black.
 2014-03-31 00:07:55 +01:00
Sryder13
9f0aacb059 MD2 Texture load fix 
Fixes MD2's using sprites on the first frame when they're loaded.
 2014-03-30 17:45:58 +01:00
Sryder13
652f3395a9 Merge https://github.com/STJr/SRB2 2014-03-28 23:29:20 +00:00
Sryder13
fc978c79bb OpenGL wall Y offset 
Fixed wall textures breaking when Y offset of the wall was too high.
 2014-03-28 23:28:00 +00:00
Alam Ed Arias
a80d925daf Merge branch 'master' of github.com:STJr/SRB2 into sdl2 2014-03-28 11:59:57 -04:00
Alam Ed Arias
1b0b9fa537 Merge branch 'master' of https://github.com/ilag11111/SRB2 
With whitespace fixup
 2014-03-28 11:58:35 -04:00
ilag11111
544682f140 Proof of concept fix for Sonic not being MD2-able 2014-03-27 18:04:03 -07:00
Alam Ed Arias
bf51c09ea3 2.1.6 release 
Merge branch 'master' of github.com:STJr/SRB2 into sdl2
 2014-03-24 22:28:59 -04:00
Alam Ed Arias
32de698f5e SRB2 2.1.6 release 2014-03-24 22:17:59 -04:00
Alam Ed Arias
d040190a66 Merge branch 'master' of github.com:STJr/SRB2 into sdl2 2014-03-24 19:47:14 -04:00
Alam Ed Arias
a9c2395e8d SDL interface no longer use FMOD.dll 2014-03-24 19:40:54 -04:00
Alam Ed Arias
69d3f325f5 off_t for linux onl;y 2014-03-24 19:40:04 -04:00
Alam Ed Arias
f5b4187af6 disabled DEBUG section because of use of SDL_VideoDriverName() 2014-03-24 19:39:42 -04:00
Alam Ed Arias
21fc19f9d0 Win32 CPU cpuinfo was also using SDL_MMXExt() and SDL_Had3DNewExt() 2014-03-24 19:39:05 -04:00
Sryder13
3fbe3d38d3 OpenGL Patch Fill Fix 
Patch Fill Drawing for intermission has been fixed to loop properly in
non aspect correct resolutions.
 2014-03-24 20:06:13 +00:00
Sryder13
b075d1e3fa Redwall sky gone 
More redwall sky shenanigans gone.
 2014-03-24 17:29:14 +00:00
Sryder13
9e10e3278b Negative Light 
Light no longer goes wrong when lightlevel of a sector is negative.
 2014-03-24 17:11:45 +00:00
Sryder13
770c7eeade LightLevelToLum gone 
LightLevelToLum unused by everything now, it seemed to be giving wrong
values for lightlevels.
 2014-03-24 16:11:25 +00:00
Sryder13
103258e364 OpenGL Flipped Patch Drawing 
V_FLIP in OpenGL.
 2014-03-23 23:37:44 +00:00
Alam Ed Arias
bb6688107b bump Srb2mac project 2014-03-23 12:06:07 -04:00
Alam Ed Arias
15bd266cac SRB2 2.1.5 release 2014-03-23 12:00:29 -04:00
Alam Ed Arias
3a5fcc58da Let steal some OpenGL fixes 
Merge branch 'master' of https://github.com/Sryder13/SRB2
 2014-03-23 10:31:31 -04:00
Sryder13
734d6b56f0 OpenGL Flashpal Flashes 
Fixed flashes for OpenGL Nukes/Teleports etc.
 2014-03-23 00:04:35 +00:00
Alam Arias
5e24fe8937 Fixup Srb2Mac to exclude srb2.srb from Lite pack 2014-03-22 16:09:41 -04:00
Alam Ed Arias
2b781d82d5 Quartz is evil, we need to ask for a new modeList 2014-03-22 15:54:46 -04:00
Sryder13
9386b3900b OpenGL remove HOMs 
Removes HOMs from OpenGL.
This also seems to have made skyboxes not draw ontop of everything else
on Intel GPU's.
 2014-03-22 17:17:40 +00:00
Sryder13
1f452953b6 Post processor skybox 
Post processing no longer done in the skybox.
 2014-03-22 14:52:32 +00:00
Sryder13
7b6aeefea0 Hopefully correct 
Pulled
 2014-03-21 21:40:37 +00:00
Sryder13
ec902fed52 OpenGL Intermission picture fix 
Fixes intermission pictures being taken in OpenGL.
 2014-03-21 20:28:41 +00:00
Alam Arias
dcaac56f9a bump SRB2Mac version 2014-03-21 16:05:12 -04:00
Alam Ed Arias
ed72bd8fa1 SRB2 2.1.4 release 2014-03-21 19:21:06 +00:00
Alam Ed Arias
505ea76834 SRB2 2.1.4 release 2014-03-21 14:42:55 -04:00
Sryder13
c72fc0f10d Warning gone. 
Hopefully.
 2014-03-21 18:03:40 +00:00
Ronald Kinard
be96974742 sdl2: Fix mouse button input 2014-03-20 23:37:57 -05:00
Ronald Kinard
d298aa8e0d sdl2: Restore mouse motion support 2014-03-20 22:37:26 -05:00
Ronald Kinard
4c636123a4 sdl2: Bump up mixer support to SDL2_mixxer 2014-03-20 21:54:02 -05:00
Ronald Kinard
3839c2fd58 sdl2: Zero out buffer on sound callback 2014-03-20 20:07:50 -05:00
Ronald Kinard
40de8ea630 sdl2: Make -win toggle cvar instead of disabling fullscreen 2014-03-20 17:48:10 -05:00
Ronald Kinard
ad1b9f93c8 sdl2: Fix changing between fullscreen/windowed 2014-03-20 17:26:07 -05:00
Sryder13
24681013d1 Opaque translucent midtextures 
Fixed translucent midtextures being opaque when there were multiple
lights in a sector.
 2014-03-20 20:34:56 +00:00
Sryder13
dd16f58e38 OpenGL Skybox 
OpenGL skyboxes.
Slight change to sky vertical offsetting.
 2014-03-20 20:13:15 +00:00
Sryder13
7aa960d6d5 Software Cropped Patches 
Fixed the stupid error I made that was causing software to not draw
cropped patches.
 2014-03-20 10:29:53 +00:00
Ronald Kinard
beb2672f40 sdl2: fix mode changing 2014-03-20 02:26:02 -05:00
Ronald Kinard
559c7ceb4d sdl2: aspect correction in fullscreen, clear on blit 2014-03-20 02:14:03 -05:00
Ronald Kinard
3b137d094a sdl2: support windowed fullscreen as default 2014-03-20 02:08:45 -05:00
Ronald Kinard
715a12ff08 sdl2: support all windowed mode resolutions 2014-03-20 01:09:52 -05:00
Ronald Kinard
5273989dcd sdl2: restore keyboard input 2014-03-19 20:19:31 -05:00
Ronald Kinard
63e47c1f0e sdl2: it works 2014-03-19 19:55:07 -05:00
Ronald Kinard
cb55317533 sdl2: fix memory detection on 64-bit linux 2014-03-19 19:54:47 -05:00
Sryder13
2b80874646 MD2's replacing skinned mobj fix 
MD2's that replace mobjs that have a skin, but the skin doesn't have an
MD2 now display.
 2014-03-19 23:40:02 +00:00
Ronald Kinard
0fb3e3e568 sdl2: remove unsupported platform-specific folders 2014-03-19 18:24:23 -05:00
Ronald Kinard
648a91adec remove hi-res filters 2014-03-19 18:21:53 -05:00
Ronald Kinard
c282fe9dec i_video.c: remove old cruft and dead code 2014-03-19 18:15:58 -05:00
Sryder13
ba0c93d814 MD2 & Patch drawing fixes 
MD2's can be translucent again.
MD2's can use sprites instead of another random texture if they have no
texture.
Patches are drawn in the correct place on non aspect correct
resolutions.
Cropped Patches are drawn.
 2014-03-19 23:10:37 +00:00
Ronald Kinard
89cfb674d9 Stub out unfinished implementations 2014-03-19 17:52:18 -05:00
Ronald Kinard
2a827a98bb Initial SDL2 renderer impmlementation work. 2014-03-19 02:31:50 -05:00
Alam Ed Arias
2fed5d1270 SRB2 2.1.3 release 2014-03-18 13:56:54 -04:00
Ronald Kinard
eb70242fd0 Fix -dedicated under sdl 2014-03-17 22:37:56 -05:00
Ronald Kinard
15b177ebbb Fix state compression for 64-bit hosts 2014-03-17 13:23:16 -05:00
Alam Ed Arias
a03da73115 SRB2 2.1.2 release 2014-03-17 08:13:16 -04:00
Alam Ed Arias
3e0b5ef1cd SRB2 2.1.1 release 2014-03-15 18:55:07 -04:00
Alam Ed Arias
b93cb1b65a SRB2 2.1 release 2014-03-15 13:11:35 -04:00