toasterbabe
0cca852eb6
Revert "Correction of some other relevant places to the previous commit."
...
This reverts commit a88b21f703
2016-11-12 15:39:42 +00:00
toasterbabe
a88b21f703
Correction of some other relevant places to the previous commit.
2016-11-12 14:34:25 +00:00
toasterbabe
286a8b0289
Nev3r wants to make barrels which are both shootable and die when you break them like you break monitors.
...
To that end, I've made MF_MONITOR *without* MF_SHOOTABLE act like MF_MONITOR does, and MF_SHOOTABLE allow for both missiles AND players to destroy. This has had the side effect of allowing MF_ENEMY and MF_BOSS to use MF_MONITOR as a substitute for MF_SHOOTABLE that doesn't allow missiles to cause them damage, which might be useful for Jetty-syns.
2016-11-12 14:08:27 +00:00
toasterbabe
645e7298c0
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions
2016-11-12 13:43:02 +00:00
Inuyasha
c545194bef
update colors to new palette
2016-11-10 16:53:27 -08:00
Inuyasha
1ff498fcfd
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
...
# Conflicts:
# src/console.c
2016-11-10 16:20:03 -08:00
Inuyasha
6c40eb5cd7
Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2 into public_next
2016-11-10 16:13:35 -08:00
Monster Iestyn
fea97b4880
Merge branch 'master' into next
2016-11-10 16:45:49 +00:00
Monster Iestyn
1b6c1a02c9
Merge branch 'reduced-palette-quick-fix' into 'master'
...
Reduced palette quick fix
Fixes a leftover from the days of the old palette
See merge request !50
2016-11-10 09:30:53 -05:00
Inuyasha
2569a1eda6
Merge branch 'console-improvements' into 'master'
...
Console improvements
* Unused console backgrounds no longer take up memory
* Input cursor can now move left and right
* Support for selections (Shift-arrow keys, CTRL-A, etc)
* Clipboard support (CTRL-C to copy, CTRL-V to paste, CTRL-X to cut)
* Fixed handling of simultaneous modifier key presses
https://dl.dropboxusercontent.com/u/3518218/21/console.gif
None of this affects chat yet, that's not part of the console. I'll look at it later.
See merge request !133
2016-11-09 20:42:56 -05:00
Monster Iestyn
14cd274baa
Change 0xF7 to 0xFF in R_GenerateTexture
2016-11-07 20:27:12 +00:00
Monster Iestyn
cb1fbbf345
Merge branch 'public_next'
2016-11-06 18:02:12 +00:00
Monster Iestyn
798f4d498d
Merge branch 'next' into public_next
2016-11-06 18:01:49 +00:00
Monster Iestyn
f97301b8b8
Merge branch 'master' into next
2016-11-06 17:59:35 +00:00
Monster Iestyn
0882dd79c0
Merge branch 'md2-limits-check-hotfix' into 'master'
...
MD2 limits check hotfix
Fixing slight mistake made in merge request !132 that someone else spotted, no real explanation needed
See merge request !134
2016-11-06 12:57:48 -05:00
Monster Iestyn
2dfb841c38
Correcting slight mistake I made
2016-11-06 17:50:04 +00:00
toasterbabe
b5a6bfe046
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions
2016-11-06 16:03:12 +00:00
Monster Iestyn
2df7d8c4aa
Merge branch 'public_next'
2016-11-05 19:52:27 +00:00
Monster Iestyn
90d82a8358
Merge branch 'next' into public_next
2016-11-05 19:51:57 +00:00
Monster Iestyn
7b9328781f
Merge branch 'master' into next
2016-11-05 19:36:04 +00:00
Monster Iestyn
3bf19a004e
Merge branch 'md2-limits-check' into 'master'
...
MD2 vertex/frame/triangle/etc limits checking
Fix for this bug: http://mb.srb2.org/showthread.php?t=42099
The model reading code didn't properly check if the model had too many vertices, so models with higher counts freely broke the game. This fix now stops that and prints an error message if that is the case.
However, it seems some models happily exceed other limits such as texcoords without problem (to my knowledge), so I've not bothered with checking those limits for now. Perhaps this could be a time to discuss if we need to change such limits again or not? Either way, one can easily uncomment my lines for checking texcoords/skins/triangles limits later if needed.
EDIT: I've allowed checking for triangle and frame limits too now, after some discussion.
See merge request !132
2016-11-05 15:20:39 -04:00
Monster Iestyn
8909b7c27b
Change >= to >, I THINK having exactly 4096 vertices is safe?
2016-11-05 17:38:36 +00:00
Inuyasha
55400a262d
go fuck yourself stupid compiler
...
...your guesses should not be treated as errors.
2016-11-04 02:02:26 -07:00
Inuyasha
010c52aed2
show highlight BG over ellipses if highlight extends offscreen
...
+ bug fixes
2016-11-03 19:36:43 -07:00
Inuyasha
bb92986aee
Merge branch 'console-improvements' of http://git.magicalgirl.moe/STJr/SRB2 into console-improvements
...
# Conflicts:
# src/sdl/i_system.c
2016-11-03 17:31:24 -07:00
Inuyasha
e245cdfcbf
Console with moving cursor, selections, etc
2016-11-03 17:30:30 -07: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
Alam Ed Arias
1f6388a2e0
Fix up Win32 interface code misdeclaration of I_ClipboardPaste()
2016-11-03 14:35:32 -04:00
Alam Ed Arias
8040a68fa0
Clipboard: remove Win32 code for SDL Clipboard API
2016-11-03 14:29:51 -04:00
Alam Ed Arias
f3751828cb
Merge branch 'master' into next
2016-11-03 12:51:48 -04:00
Inuyasha
bb20cfd6be
Clipboard copy/paste testing
...
(unfinished, but basics work)
2016-11-03 01:43:57 -07:00
Alam Arias
115b99db0f
Merge pull request #132 from STJr/revert-130-console-and-chat-improvement
...
Revert "Chat and console improvements"
2016-11-03 03:36:50 -04:00
STJrInuyasha
b2c71944f6
Revert "Chat and console improvements"
2016-11-03 00:34:15 -07:00
Alam Ed Arias
941df72b6f
Merge branch 'master' into next
2016-11-03 02:06:49 -04:00
Alam Arias
d4ee063c4c
Merge pull request #130 from LJSonik/console-and-chat-improvement
...
Chat and console improvements
2016-11-03 02:05:47 -04:00
Inuyasha
c277125fe7
modifier key status made globally accessible
...
now also properly handles L/R simultaneous presses
2016-11-02 15:23:22 -07:00
Inuyasha
8107765677
make console back color use just one section of memory
...
let's be honest, it's pretty dumb to have every single possible back colormap in memory when only one is being used at a time
2016-11-02 14:26:35 -07:00
Louis-Antoine
8b72b553be
Fixed warnings
2016-11-02 20:10:08 +01:00
Louis-Antoine
2d72b2fac6
You can now move the cursor in command prompt and chat, using left/right, ctrl+left/right, home/end, and select text with shift
2016-11-02 19:31:06 +01:00
Alam Ed Arias
67d2211bca
whitespace: cleanup
2016-11-01 15:54:52 -04:00
Monster Iestyn
4d46190418
Merge branch 'public_next'
2016-10-30 19:34:54 +00:00
Monster Iestyn
6e73e2cd97
Merge branch 'next' into public_next
2016-10-30 19:34:29 +00:00
Alam Ed Arias
5fed10913f
Merge branch 'master' into next
2016-10-30 13:02:01 -04:00
toasterbabe
f77c3444a3
Don't use shield abilities after the armageddon's used up!
2016-10-30 14:23:53 +00:00
toasterbabe
6570912b1a
Fixed gold monitor collision (which relied upon the shitty old collision blocking in order to not destroy your momentum) to work with my slopes_n_objects fixes from public next.
2016-10-30 14:09:51 +00:00
toasterbabe
08a4fc8382
Tweaks to the way the force whoosh is handled so it stays centered AND doesn't allow an infinitesimal jump.
2016-10-30 14:01:56 +00:00
Alam Arias
51cb45cd4b
Merge pull request #119 from ilag11111/linux64-soundcrash-fix
...
Prevent resampling-related crashes on Linux 64-bit
2016-10-29 14:14:41 -04:00
toasterbabe
5a798bddbd
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions
2016-10-29 17:14:45 +01:00
