toaster
c52a4de933
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems
...
# Conflicts:
# src/f_finale.c
# src/hardware/hw_md2.c
2018-08-07 21:20:27 +01:00
TehRealSalt
ec0c358755
Merge branch 'master' into sonicitems
2018-07-08 17:51:44 -04:00
Sryder
7b82d0e695
Fix warning relating to max 0 with an unsigned variable
...
I've looked at the code above and can't see anything that would try to lower the value below 0 as it's mostly just addition and dividing
2018-07-07 00:34:03 +01:00
Monster Iestyn
f1bba60373
Merge branch 'md2-fopen-error' into 'master'
...
More helpful error messages
See merge request STJr/SRB2!243
2018-07-06 14:38:59 -04:00
Monster Iestyn
130de10f97
Merge branch 'md2-smoother-interpolation' into 'master'
...
Smoother MD2 interpolation
See merge request STJr/SRB2!224
2018-07-06 14:38:37 -04:00
TehRealSalt
6627483e37
Misc tweaks (mostly color related)
...
- Smoothed out Ruby & Sepia
- Made Sapphire more distinct from Blue
- Made Navy more distinct from Jet
- MD2 colors weight a few colors even more heavily
- Revised ColorOpposite table
- Fix Wanted not updating on hit
- Very minor item odds adjustment for Battle
2018-07-06 14:22:48 -04:00
TehRealSalt
01f1229477
Weight certain shades of MD2 blends
2018-07-05 01:13:21 -04:00
TehRealSalt
82734fcf94
Banana drag slowdown, diagonal springs scale to map scale instead of object's scale, OGL skincolors average all colors
2018-07-04 19:06:45 -04:00
toaster
fe8b98ec22
On a hunch, looked it up. Turns out it's a common typo, and that a nickle is actually a type of green woodpecker!! :V
2018-07-02 19:06:05 +01:00
TehRealSalt
3184d2a7b0
Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint
2018-07-02 13:54:01 -04:00
toaster
e76c328129
Sorry, Sal! In my defense, you don't need to recompile from scratch for any of this, despite what it may look like, as the skincolour name lists are walled off from the rest of the dehacked lists...
...
More menu/highlight things:
* Rename "Default" to "Game type", to make clearer what it's doing.
* Tweak race colouring slightly.
* Put a highlight around the level select icon, and make it consistent with voting.
* Allow setting the highlight colour to affect the intermissions.
* Fix bug with gametype colour getting for record attack.
A handful of skincolour things:
* Rename Turqouise to Aqua, because it resembles one of my fav 2.2 colours with that name.
* Fix incomplete Steel Blue -> Steel rename.
* Merge the very similar Blueberry and Sapphire...
* ... so Sapphire can be backported!
* And Ruby too.
2018-07-02 13:20:04 +01:00
TehRealSalt
4ffb80806b
Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems
2018-07-02 03:36:43 -04:00
TehRealSalt
b3cae5d633
Revamped colors
...
- The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more
- Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?!
- Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two.
- Caramel has been removed, Shiny Caramel takes its place.
- Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names.
- Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 03:30:33 -04:00
TehRealSalt
4e2b30fcae
Fixes
2018-06-08 00:02:28 -04:00
Steel Titanium
b4d479ad9a
Include errno if not already included.
2018-05-13 16:04:34 -04:00
Steel Titanium
7f084868b9
More helpful error message
2018-05-13 15:35:38 -04:00
GoldenTails
7783ddd134
Update hw_md2.c
2018-05-13 14:34:08 -05:00
GoldenTails
5f0a45124c
Update hw_md2.c
2018-05-13 14:32:33 -05:00
GoldenTails
e66e0bb20e
Fixed MD2 models not loading correctly on Linux
2018-05-13 14:19:36 -05:00
Steel Titanium
0cc4b8d6db
Smoother MD2 interpolation
2018-02-06 14:50:08 -05:00
Sryder13
b4db82336b
Star colour support for MD2s
2018-02-05 02:11:17 +00:00
TehRealSalt
4a23c4704d
Rendering fixes ahoy!
...
- Fix squished sky in Software 3P/4P
- Fix reversed sky in OpenGL Mirror Mode
- Fix MD2 culling in Mirror Mode
2017-12-29 14:50:16 -05:00
TehRealSalt
c38423eeb0
Merge remote-tracking branch 'srb2public/next' into quads
...
Update
2017-12-22 20:55:59 -05:00
Sryder13
c9ddb7a4b5
Re-add lost player vibration frames
...
Separate sprites for fast moving frames
Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
Sryder13
81a077b9af
New player frameangle used instead of mobj angle for players
...
Set to mobj angle except when spinning where it's set to spin
Only 1 spin frame needed now
2017-11-04 14:07:53 +00:00
Monster Iestyn
2b1fb67a5f
DrawMD2i: change duration and tics to INT32, fix up any related code
2017-10-30 19:12:51 +00:00
Sryder13
bd55a295bd
Skin colours for MD2s
...
This isn't amazing, until I implement something better (probably not until 2.2) it will have to do
2017-10-26 20:57:36 +01:00
Wolfy
faf886885e
Have Kart use kmd2.dat instead of md2.dat
2017-10-11 20:26:34 -05:00
Sryder
35b789d330
Fix random duplicate code from merge in hw_main.c and r_segs.c
...
Whitespace cleanup
2017-02-18 00:25:16 +00:00
Sryder
68d439a783
Merge branch 'upstream/next' into zarrotsu_vanillamerge
...
# Conflicts:
# src/Makefile
# src/doomdef.h
# src/hardware/hw_main.c
# src/p_mobj.c
# src/p_user.c
# src/r_segs.c
# src/sdl/i_video.c
# src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Sryder
2d6c7959ed
Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge
...
# Conflicts:
# .gitignore
# libs/zlib/projects/visualc10/zlib.vcxproj
# src/Makefile
# src/am_map.c
# src/d_main.c
# src/dehacked.c
# src/doomdef.h
# src/g_game.c
# src/hardware/hw_main.c
# src/hardware/hw_md2.c
# src/info.c
# src/p_inter.c
# src/p_map.c
# src/p_mobj.c
# src/p_spec.c
# src/p_user.c
# src/r_bsp.c
# src/r_plane.c
# src/r_segs.c
# src/r_things.c
# src/s_sound.c
# src/s_sound.h
# src/sdl/Srb2SDL-vc10.vcxproj
# src/win32/Srb2win-vc10.vcxproj
# src/win32/Srb2win.ico
# src/y_inter.c
2017-02-17 20:03:10 +00:00
Monster Iestyn
2dfb841c38
Correcting slight mistake I made
2016-11-06 17:50:04 +00:00
Monster Iestyn
8909b7c27b
Change >= to >, I THINK having exactly 4096 vertices is safe?
2016-11-05 17:38:36 +00:00
Monster Iestyn
efe02e2a42
allow triangle/frame limits too
2016-11-03 22:53:49 +00:00
Monster Iestyn
561a0fe768
Attempt loading of an MD2 only once; if we failed then don't bother again
...
This keeps my new error messages from flooding the console and log.txt
2016-11-03 21:06:23 +00:00
Monster Iestyn
2ec972af54
check numVertices, bail out and print error message if there are too many
...
I added similar checks for the other num* but it seems some MD2s break the other limits without knowing anyway ...so I've commented these checks out for now, unless we have further discussion regarding them later on
2016-11-03 20:40:17 +00:00
ZTsukei
d631d0ef04
S_PLAY states, HUD stuff
2016-08-14 23:51:25 -04:00
ZTsukei
4112d44529
Some Color code, Kart powers
2016-08-11 21:42:16 -04:00
ZTsukei
e4a970f894
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
Monster Iestyn
0081397920
OpenGL: Fix MD2s on player 2's screen breaking when reverse gravity is involved
2016-05-27 14:53:36 +01:00
Alam Ed Arias
51aa7692d8
Merge branch 'master' into next
2016-03-30 20:15:08 -04:00
Alam Ed Arias
d90536967d
removed/remline ununsed code
2016-03-30 14:05:07 -04:00
Alam Ed Arias
77dc27d070
Merge branch 'next' into backport_state-animations
2016-02-26 02:06:57 -05:00
Monster Iestyn
5d1c8d2968
My cherry picking somehow lead to these functions being doubled ...whoops
2016-02-09 19:35:04 +00:00
Alam Ed Arias
6000b5c980
Merge branch 'master' into next
2016-02-09 14:13:50 -05:00
Sean Ryder
ddb5652ab6
Tabbing
2016-02-09 18:05:19 +00:00
Sryder13
6b8c438e58
Change a few colours.
2016-02-09 18:05:11 +00:00
Sryder13
31deecc51c
Colour Changing MD2s
...
I don't know how I can move my old branch over so I've just created a new one.
2016-02-09 18:04:59 +00:00
Sean Ryder
b7ebb8186d
Fix MD2 interpolation for FF_ANIMATE states
2016-02-09 16:20:18 +00:00
Sean Ryder
7d914913dd
Tabbing
2016-01-20 15:55:32 +00:00
