Steel Titanium
|
66e13cf1cc
|
SDL:Auto grab input
|
2018-12-22 23:28:59 -05:00 |
|
mazmazz
|
94858aedfe
|
Extend HU_FONTSTART to STCFN022 (from 2.2)
|
2018-12-22 23:20:01 -05:00 |
|
mazmazz
|
a9fb17dab1
|
Revert "Extend HU_FONTSTART to STCFN022 (from 2.2)"
This reverts commit 6400729034.
|
2018-12-22 22:40:58 -05:00 |
|
mazmazz
|
56320a35ce
|
Use TinyFont for chat arrows
|
2018-12-22 22:40:04 -05:00 |
|
mazmazz
|
6400729034
|
Extend HU_FONTSTART to STCFN022 (from 2.2)
|
2018-12-22 21:48:24 -05:00 |
|
mazmazz
|
e0176670f4
|
Correct splitscreen check in OLDCHAT
|
2018-12-22 21:30:39 -05:00 |
|
mazmazz
|
7e9411f320
|
Minor code cleanup, CHAT
|
2018-12-22 21:17:01 -05:00 |
|
Alam Ed Arias
|
7285f9ff1d
|
Netcode: handle NULL in addrinfo lookup
|
2018-12-22 21:06:13 -05:00 |
|
mazmazz
|
a66a2021ba
|
Draw up and down arrows by string
|
2018-12-22 20:57:53 -05:00 |
|
mazmazz
|
fb3722a6f3
|
Accommodate Kart splitscreen code for CHAT via #define NETSPLITSCREEN
|
2018-12-22 20:52:32 -05:00 |
|
Alam Ed Arias
|
0ed9665a79
|
Added static library of SDL2 and SDL2_mixer for ARM systems
|
2018-12-22 20:48:15 -05:00 |
|
mazmazz
|
0f0e30924f
|
One more free(nodenum)
|
2018-12-22 20:35:12 -05:00 |
|
mazmazz
|
5badc11159
|
Fix integer overflow on for loop decrements
|
2018-12-22 20:18:25 -05:00 |
|
Alam Ed Arias
|
102fd11cb4
|
More work to cleanup the ARM builds
|
2018-12-22 19:50:32 -05:00 |
|
Alam Arias
|
c5ec1e30a4
|
Merge pull request #391 from monster-psychic-cat/sw_largeroomfix
Large room fix
|
2018-12-22 19:48:08 -05:00 |
|
Alam Ed Arias
|
4265be776c
|
Merge branch 'master' into next
|
2018-12-22 19:36:32 -05:00 |
|
Alam Arias
|
194f9ea8c0
|
Merge branch 'next' into sw_largeroomfix
|
2018-12-22 19:34:22 -05:00 |
|
Latapostrophe
|
c7060aa5ad
|
Remove mute boolean from playermsg hook, fix username stuff still being there, potential memory leaks, and added back the ip message.
|
2018-12-22 16:44:58 +01:00 |
|
Digiku
|
974a8e3e2b
|
Merge branch 'sdl-vidmode-display-fix' into 'master'
SDL: Center window on current monitor during vidmode change
Closes #47
See merge request STJr/SRB2!415
|
2018-12-22 09:06:55 -05:00 |
|
Latapostrophe
|
619dd9d08a
|
Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages.
|
2018-12-22 12:34:17 +01:00 |
|
Latapostrophe
|
b1ccfa1f46
|
Merge branch 'latsrb2chat' into 'SRB2-CHAT'
Fix various bugs.
See merge request SinnamonLat/SRB2!4
|
2018-12-22 04:37:24 -05:00 |
|
mazmazz
|
8707b2f40a
|
Center window on current monitor during vidmode change
|
2018-12-22 01:43:58 -05:00 |
|
mazmazz
|
cb619e0353
|
Don't create movement events from joy or mouse when menu is active
|
2018-12-22 01:20:24 -05:00 |
|
Digiku
|
66dc5a8712
|
Merge branch 'menu-screenshot-fix' into 'master'
Menu screenshot fix
Closes #45
See merge request STJr/SRB2!413
|
2018-12-22 00:40:18 -05:00 |
|
TehRealSalt
|
1291d35e08
|
Don't allow non-keyboard keys to screenshot/gif in menus
|
2018-12-22 00:39:32 -05:00 |
|
Steel Titanium
|
10521d161c
|
Fix various bugs with the chat.
|
2018-12-21 22:28:28 -05:00 |
|
Steel Titanium
|
e42bcd5b68
|
Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into latsrb2chat
|
2018-12-21 20:29:33 -05:00 |
|
Alam Arias
|
b6a917cda1
|
Added ARM/ARM64 to whole vc10 sln
Added ARM/ARM64 to zlib, libpng
Added ARM/ARM64 to srb2dd/srb2sdl
|
2018-12-21 16:47:10 -05:00 |
|
Monster Iestyn
|
a72d79da54
|
Merge branch 'master' into next
|
2018-12-21 17:41:19 +00:00 |
|
Latapostrophe
|
d6c99a0133
|
Merge branch 'SRB2-CHAT-FLOAT-FIX' into 'SRB2-CHAT'
Adjust vid.width floating point comparson for CHAT
See merge request SinnamonLat/SRB2!3
|
2018-12-21 11:51:24 -05:00 |
|
Digiku
|
cd8a147c95
|
Merge branch '2122-credits-update-2' into 'next'
Re-order Special Thanks -- groups first, then names in ABC order
See merge request STJr/SRB2!411
|
2018-12-21 11:41:41 -05:00 |
|
mazmazz
|
90832938c9
|
Re-order Special Thanks -- groups first, then names in ABC order
|
2018-12-21 11:40:35 -05:00 |
|
mazmazz
|
06ff171e19
|
Adjust vid.width floating point comparson for CHAT
|
2018-12-21 11:37:22 -05:00 |
|
mazmazz
|
e20c70d5fb
|
Skip setting control if keynum is -1 (for KEY_PAUSE) handling
|
2018-12-20 18:27:44 -05:00 |
|
Digiku
|
41a25a68c9
|
Merge branch '2122-credits-update' into 'next'
Add sirjuddington and CodeImp to Special Thanks credits
See merge request STJr/SRB2!409
|
2018-12-20 18:06:08 -05:00 |
|
Digiku
|
edbf9073c6
|
Merge branch '2122-execversion' into '2122-version'
EXECVERSION adjustments (config updater)
See merge request STJr/SRB2!408
|
2018-12-20 18:01:48 -05:00 |
|
mazmazz
|
f1fea30045
|
Properly restrict EXECVERSION from cvar updates
|
2018-12-20 17:56:51 -05:00 |
|
mazmazz
|
f66ee8c4cd
|
Add sirjuddington and CodeImp to Special Thanks credits
|
2018-12-20 17:27:25 -05:00 |
|
mazmazz
|
9be1ee4ac7
|
Hardcode define MAJOREXECVERSION to MODVERSION
|
2018-12-20 17:16:04 -05:00 |
|
mazmazz
|
6affe807e8
|
Merge branch '2122-version' into 2122-execversion
|
2018-12-20 17:14:53 -05:00 |
|
Digiku
|
58a2cec70f
|
Merge branch 'float_equal' into 'master'
Clear Float equal warnings
See merge request STJr/SRB2!383
|
2018-12-20 16:58:37 -05:00 |
|
Jimita
|
2b59cfa63f
|
Merge branch 'next' into sw_largeroomfix
|
2018-12-20 19:58:16 -02:00 |
|
Jimita
|
b68e01cb2b
|
Merge branch 'next' into sw_largeroomfix
|
2018-12-20 19:57:38 -02:00 |
|
Digiku
|
9525de2d83
|
Merge branch 'camera-backport' into 'next'
Suggestion: 2.2 camera changes backport
See merge request STJr/SRB2!393
|
2018-12-20 16:57:23 -05:00 |
|
Digiku
|
28c8ad3dbb
|
Merge branch 'jump-spin-axes' into 'next'
Feature: Jump/Spin axes
See merge request STJr/SRB2!389
|
2018-12-20 16:57:05 -05:00 |
|
Digiku
|
75e570f2b4
|
Merge branch 'joy-jump-defaults' into 'next'
Assign joy button defaults for 1 and 2 player
See merge request STJr/SRB2!400
|
2018-12-20 16:56:09 -05:00 |
|
Digiku
|
50221c47e9
|
Merge branch 'menu-2pcontrols-fix' into 'master'
Fix 2p control menu graying out
See merge request STJr/SRB2!407
|
2018-12-20 16:54:52 -05:00 |
|
Jimita
|
2bdf56804c
|
Merge branch 'next' into sw_largeroomfix
|
2018-12-20 19:53:24 -02:00 |
|
Digiku
|
f405f1ae30
|
Merge branch 'cmake-dllpath-fix' into 'master'
Update CMake paths for Windows DLLs
See merge request STJr/SRB2!406
|
2018-12-20 16:53:06 -05:00 |
|
MPC
|
9d93f54b67
|
bland
|
2018-12-20 18:52:51 -03:00 |
|