taylor/freespace2.git
13 months agofixes for demo upsells
Taylor Richards [Sun, 14 Jan 2018 20:28:10 +0000 (15:28 -0500)]
fixes for demo upsells

 - be sure we don't exit game at end of demo
 - only call upsell function when it's a demo build
 - add proper (async) wait time when quiting game from upsells

13 months agodon't do framerate control ourselves in emscripten builds
Taylor Richards [Sun, 14 Jan 2018 20:23:43 +0000 (15:23 -0500)]
don't do framerate control ourselves in emscripten builds

13 months agoadd additional emscripten files to cleanup list
Taylor Richards [Sun, 14 Jan 2018 20:22:52 +0000 (15:22 -0500)]
add additional emscripten files to cleanup list

13 months agomake loading screen and title screen work with emterpreter async
Taylor Richards [Sun, 14 Jan 2018 20:21:59 +0000 (15:21 -0500)]
make loading screen and title screen work with emterpreter async

13 months agopopup() -> popup_sync() change for FS1 builds
Taylor Richards [Fri, 5 Jan 2018 00:52:00 +0000 (19:52 -0500)]
popup() -> popup_sync() change for FS1 builds

13 months agodon't add ShowFPS to config by default since it overrides build defaults
Taylor Richards [Fri, 5 Jan 2018 00:51:08 +0000 (19:51 -0500)]
don't add ShowFPS to config by default since it overrides build defaults

13 months agoonly use app name for IndexedDB path (easier to clear data later)
Taylor Richards [Fri, 5 Jan 2018 00:48:36 +0000 (19:48 -0500)]
only use app name for IndexedDB path (easier to clear data later)

13 months agostrip down html shell to the most basic stuff
Taylor Richards [Fri, 5 Jan 2018 00:47:41 +0000 (19:47 -0500)]
strip down html shell to the most basic stuff

13 months agomake emscripten link flags a lot easier to deal with
Taylor Richards [Fri, 5 Jan 2018 00:46:00 +0000 (19:46 -0500)]
make emscripten link flags a lot easier to deal with

13 months agodo some minor cleanup
Taylor Richards [Fri, 5 Jan 2018 00:44:10 +0000 (19:44 -0500)]
do some minor cleanup

13 months agoadd RELEASE_REAL define to other release build types
Taylor Richards [Fri, 5 Jan 2018 00:43:16 +0000 (19:43 -0500)]
add RELEASE_REAL define to other release build types

13 months agobuild demo by default with emscripten (no option)
Taylor Richards [Fri, 5 Jan 2018 00:41:02 +0000 (19:41 -0500)]
build demo by default with emscripten (no option)

13 months agobump required cmake version to 2.8.6 (for APPEND_STRING)
Taylor Richards [Fri, 5 Jan 2018 00:39:57 +0000 (19:39 -0500)]
bump required cmake version to 2.8.6 (for APPEND_STRING)

13 months agomove emscripten header include to platform.h
Taylor Richards [Fri, 5 Jan 2018 00:37:56 +0000 (19:37 -0500)]
move emscripten header include to platform.h

13 months agoset game window as resizable for emscripten
Taylor Richards [Fri, 5 Jan 2018 00:35:43 +0000 (19:35 -0500)]
set game window as resizable for emscripten

13 months agodisable multi in FS2 demo with emscripten for now
Taylor Richards [Fri, 5 Jan 2018 00:33:21 +0000 (19:33 -0500)]
disable multi in FS2 demo with emscripten for now

13 months agobetter comment FS1 demo pilot file hack
Taylor Richards [Fri, 5 Jan 2018 00:29:57 +0000 (19:29 -0500)]
better comment FS1 demo pilot file hack

13 months agocorrect center positions of mainhall door animations
Taylor Richards [Sun, 31 Dec 2017 20:03:18 +0000 (15:03 -0500)]
correct center positions of mainhall door animations

13 months agofix mouse handling when viewport is other than default size
Taylor Richards [Sun, 31 Dec 2017 20:02:29 +0000 (15:02 -0500)]
fix mouse handling when viewport is other than default size

13 months agofix special dot sliders in FS1
Taylor Richards [Sun, 31 Dec 2017 17:52:56 +0000 (12:52 -0500)]
fix special dot sliders in FS1

13 months agomake first pass at async popups
Taylor Richards [Wed, 13 Dec 2017 00:45:15 +0000 (19:45 -0500)]
make first pass at async popups

13 months agobe sure that buildver target is attached to the launcher exec
Taylor Richards [Wed, 13 Dec 2017 00:33:32 +0000 (19:33 -0500)]
be sure that buildver target is attached to the launcher exec

13 months agoswitch to WebAssembly; start of custom html shell; cleanup
Taylor Richards [Tue, 12 Dec 2017 19:53:58 +0000 (14:53 -0500)]
switch to WebAssembly; start of custom html shell; cleanup

13 months agosupport persistent file storage for Emscripten
Taylor Richards [Fri, 8 Dec 2017 06:14:58 +0000 (01:14 -0500)]
support persistent file storage for Emscripten

13 months agomodify gameseq such that we can process an event with an unset state
Taylor Richards [Fri, 8 Dec 2017 06:13:26 +0000 (01:13 -0500)]
modify gameseq such that we can process an event with an unset state

13 months agodon't return error on successful exit of game_main()
Taylor Richards [Fri, 8 Dec 2017 06:11:17 +0000 (01:11 -0500)]
don't return error on successful exit of game_main()

13 months agofix memory size detection for Emscripten builds
Taylor Richards [Fri, 8 Dec 2017 06:08:49 +0000 (01:08 -0500)]
fix memory size detection for Emscripten builds

13 months agoremove SOURCE_RELATIVE hack, it's an Emscripten bug
Taylor Richards [Fri, 8 Dec 2017 06:05:26 +0000 (01:05 -0500)]
remove SOURCE_RELATIVE hack, it's an Emscripten bug

13 months agodeal with double free() errors on shutdown
Taylor Richards [Fri, 8 Dec 2017 06:04:43 +0000 (01:04 -0500)]
deal with double free() errors on shutdown

13 months agoclean up CMakeLists.txt a bit regarding what gets built
Taylor Richards [Fri, 8 Dec 2017 06:02:27 +0000 (01:02 -0500)]
clean up CMakeLists.txt a bit regarding what gets built

13 months agoset RELEASE_REAL and -O3 on Release build type
Taylor Richards [Fri, 8 Dec 2017 05:58:21 +0000 (00:58 -0500)]
set RELEASE_REAL and -O3 on Release build type

13 months agoset RelWithDebInfo as default build type
Taylor Richards [Fri, 8 Dec 2017 05:57:15 +0000 (00:57 -0500)]
set RelWithDebInfo as default build type

13 months agore-enable custom.cmake
Taylor Richards [Thu, 7 Dec 2017 03:29:42 +0000 (22:29 -0500)]
re-enable custom.cmake

13 months agouse LEGACY_GL to determine of GL1 is used or not
Taylor Richards [Thu, 7 Dec 2017 03:05:27 +0000 (22:05 -0500)]
use LEGACY_GL to determine of GL1 is used or not

13 months agoplug demo upsells into the game event/state system
Taylor Richards [Thu, 7 Dec 2017 02:41:08 +0000 (21:41 -0500)]
plug demo upsells into the game event/state system

13 months agouse Emscripten compatible game loop
Taylor Richards [Thu, 7 Dec 2017 02:39:27 +0000 (21:39 -0500)]
use Emscripten compatible game loop

13 months agobypass Emscripten bug when AL source is relative
Taylor Richards [Thu, 7 Dec 2017 02:37:01 +0000 (21:37 -0500)]
bypass Emscripten bug when AL source is relative

13 months agoshutdown() not yet implemented in Emscripten
Taylor Richards [Thu, 7 Dec 2017 01:56:49 +0000 (20:56 -0500)]
shutdown() not yet implemented in Emscripten

13 months agodisable popups for now
Taylor Richards [Thu, 7 Dec 2017 01:56:05 +0000 (20:56 -0500)]
disable popups for now

13 months agostartup windowed and disable movies with Emscripten
Taylor Richards [Thu, 7 Dec 2017 01:51:26 +0000 (20:51 -0500)]
startup windowed and disable movies with Emscripten

13 months agoadd Emscripten stuff to cleanup
Taylor Richards [Thu, 7 Dec 2017 01:48:54 +0000 (20:48 -0500)]
add Emscripten stuff to cleanup

13 months agofirst pass at emscripten support
Taylor Richards [Wed, 19 Apr 2017 13:44:11 +0000 (09:44 -0400)]
first pass at emscripten support

13 months agomerge updated pxo code and related fixes
Taylor Richards [Sat, 17 Mar 2018 15:08:27 +0000 (11:08 -0400)]
merge updated pxo code and related fixes

13 months agomake build changes ...
Taylor Richards [Thu, 15 Mar 2018 23:49:11 +0000 (19:49 -0400)]
make build changes ...

 - set default build type to RelWithDebInfo
 - remove MinSizeRel build type
 - update CXX flags to work the same
 - add RELEASE_REAL to Windows builds

13 months agofix opening of URLs on Windows
Taylor Richards [Thu, 15 Mar 2018 23:48:22 +0000 (19:48 -0400)]
fix opening of URLs on Windows

13 months agoupdate PXO ranking URLs
Taylor Richards [Thu, 15 Mar 2018 22:37:58 +0000 (18:37 -0400)]
update PXO ranking URLs

13 months agoonly use SDL text input when required (fixes keyboard issues in browser)
Taylor Richards [Fri, 5 Jan 2018 00:34:47 +0000 (19:34 -0500)]
only use SDL text input when required (fixes keyboard issues in browser)

13 months agoupdate MSVC compiler options
Taylor Richards [Wed, 14 Mar 2018 03:32:35 +0000 (23:32 -0400)]
update MSVC compiler options

13 months agoback out pause changes for now
Taylor Richards [Wed, 14 Mar 2018 02:10:46 +0000 (22:10 -0400)]
back out pause changes for now

13 months agofix event and state help text
Taylor Richards [Wed, 14 Mar 2018 02:10:16 +0000 (22:10 -0400)]
fix event and state help text

13 months agoset/update netgame info on tracker in a useful way
Taylor Richards [Tue, 13 Mar 2018 17:35:26 +0000 (13:35 -0400)]
set/update netgame info on tracker in a useful way

13 months agouse a better multi_sw_ok_to_commit() check
Taylor Richards [Tue, 13 Mar 2018 17:34:11 +0000 (13:34 -0400)]
use a better multi_sw_ok_to_commit() check

13 months agoupdate Config_allowed[] for proper key layout in SDL
Taylor Richards [Sun, 11 Mar 2018 07:00:46 +0000 (03:00 -0400)]
update Config_allowed[] for proper key layout in SDL

13 months agoupdate standalone html include
Taylor Richards [Sun, 11 Mar 2018 02:01:06 +0000 (21:01 -0500)]
update standalone html include

13 months agofix linker issue with wxWidgets
Taylor Richards [Sat, 10 Mar 2018 08:25:42 +0000 (03:25 -0500)]
fix linker issue with wxWidgets

13 months agoremove remants of old special key handling removal
Taylor Richards [Sat, 10 Mar 2018 06:17:20 +0000 (01:17 -0500)]
remove remants of old special key handling removal

13 months agomake sure we always close out of pause state
Taylor Richards [Sat, 10 Mar 2018 05:43:24 +0000 (00:43 -0500)]
make sure we always close out of pause state

13 months agochange special key combos to more generic keys
Taylor Richards [Sat, 10 Mar 2018 05:01:43 +0000 (00:01 -0500)]
change special key combos to more generic keys

 Fullscreen/Window: SUPER+f -> ALT+ENTER
 Minimize window: SUPER+z -> CTRL+ALT+z
 Screenshot: SUPER+p -> CTRL+ALT+p

13 months agoallow for finding both Win32 and Win64 lib versions
Taylor Richards [Sat, 10 Mar 2018 03:54:48 +0000 (22:54 -0500)]
allow for finding both Win32 and Win64 lib versions

13 months agodeal with timestamp issue when calculating submodel rotation
Taylor Richards [Sat, 10 Mar 2018 03:52:58 +0000 (22:52 -0500)]
deal with timestamp issue when calculating submodel rotation

13 months agohandle SquadWar match query properly for standalone
Taylor Richards [Sat, 10 Mar 2018 03:51:56 +0000 (22:51 -0500)]
handle SquadWar match query properly for standalone

13 months agoavoid sending LAN broadcast with PXO game query
Taylor Richards [Sat, 10 Mar 2018 03:50:55 +0000 (22:50 -0500)]
avoid sending LAN broadcast with PXO game query

13 months agosend quit game event when OS window gets closed
Taylor Richards [Thu, 8 Mar 2018 16:35:01 +0000 (11:35 -0500)]
send quit game event when OS window gets closed

13 months agopause game on minimize, plus related cleanup
Taylor Richards [Thu, 8 Mar 2018 16:34:08 +0000 (11:34 -0500)]
pause game on minimize, plus related cleanup

13 months agostop ambient menu sound when paused
Taylor Richards [Thu, 8 Mar 2018 16:32:20 +0000 (11:32 -0500)]
stop ambient menu sound when paused

13 months agoadd RELEASE_REAL to release builds
Taylor Richards [Thu, 8 Mar 2018 16:31:49 +0000 (11:31 -0500)]
add RELEASE_REAL to release builds

13 months agotry to prevent random crashing from wing ai
Taylor Richards [Thu, 8 Mar 2018 16:31:16 +0000 (11:31 -0500)]
try to prevent random crashing from wing ai

13 months agolog out of tracker when mission ends (non-standalone)
Taylor Richards [Thu, 8 Mar 2018 16:30:28 +0000 (11:30 -0500)]
log out of tracker when mission ends (non-standalone)

13 months agoclean up stats saving a bit more
Taylor Richards [Thu, 8 Mar 2018 16:29:41 +0000 (11:29 -0500)]
clean up stats saving a bit more

13 months agofix invalid socket log spam
Taylor Richards [Wed, 7 Mar 2018 18:37:04 +0000 (13:37 -0500)]
fix invalid socket log spam

13 months agomake websocket connection work over both http and https
Taylor Richards [Mon, 5 Mar 2018 05:24:02 +0000 (00:24 -0500)]
make websocket connection work over both http and https

13 months agofix control binding
Taylor Richards [Mon, 5 Mar 2018 05:23:10 +0000 (00:23 -0500)]
fix control binding

13 months agoforce windows to ignore WIN key so we can use it
Taylor Richards [Mon, 5 Mar 2018 02:27:45 +0000 (21:27 -0500)]
force windows to ignore WIN key so we can use it

13 months agotweak stats saving to maybe work better
Taylor Richards [Mon, 5 Mar 2018 02:23:49 +0000 (21:23 -0500)]
tweak stats saving to maybe work better

17 months agoupdate URL for PXO button in launcher
Taylor Richards [Wed, 25 Oct 2017 06:36:48 +0000 (02:36 -0400)]
update URL for PXO button in launcher

18 months agomerge haptic and joystick fixes
Taylor Richards [Sun, 15 Oct 2017 04:15:13 +0000 (00:15 -0400)]
merge haptic and joystick fixes

18 months agoadd safety and some cleanup
Taylor Richards [Wed, 11 Oct 2017 17:58:16 +0000 (13:58 -0400)]
add safety and some cleanup

18 months agoallow hotplug to actually hotplug
Taylor Richards [Wed, 11 Oct 2017 17:56:40 +0000 (13:56 -0400)]
allow hotplug to actually hotplug

18 months agouse timestamp for hit effect rather than calling system function
Taylor Richards [Wed, 27 Sep 2017 18:58:23 +0000 (14:58 -0400)]
use timestamp for hit effect rather than calling system function

18 months agoforce-start pSpring on mission init
Taylor Richards [Wed, 27 Sep 2017 18:43:04 +0000 (14:43 -0400)]
force-start pSpring on mission init

18 months agoclean up debug messages a bit
Taylor Richards [Wed, 27 Sep 2017 18:42:23 +0000 (14:42 -0400)]
clean up debug messages a bit

20 months agofix crash in debug builds
Taylor Richards [Mon, 7 Aug 2017 18:59:15 +0000 (14:59 -0400)]
fix crash in debug builds

20 months agomake sure that all ff effects are stopped before closing out
Taylor Richards [Sat, 5 Aug 2017 08:49:50 +0000 (04:49 -0400)]
make sure that all ff effects are stopped before closing out

20 months agoreorder ff effects based on importance of being loaded
Taylor Richards [Sat, 5 Aug 2017 00:54:53 +0000 (20:54 -0400)]
reorder ff effects based on importance of being loaded

20 months agotry to avoid too much rumble
Taylor Richards [Thu, 3 Aug 2017 11:40:44 +0000 (07:40 -0400)]
try to avoid too much rumble

20 months agouse more acurate rumble values
Taylor Richards [Thu, 3 Aug 2017 08:55:00 +0000 (04:55 -0400)]
use more acurate rumble values

20 months agofix values for fly_by haptic effect
Taylor Richards [Thu, 3 Aug 2017 08:53:44 +0000 (04:53 -0400)]
fix values for fly_by haptic effect

20 months agoadd some debug info; plus some additional clenaup
Taylor Richards [Thu, 3 Aug 2017 08:53:06 +0000 (04:53 -0400)]
add some debug info; plus some additional clenaup

20 months agoavoid starting pSpring during effect creation
Taylor Richards [Wed, 2 Aug 2017 15:26:33 +0000 (11:26 -0400)]
avoid starting pSpring during effect creation

20 months agosetup sane defaults in joy_ff_mission_init()
Taylor Richards [Wed, 2 Aug 2017 15:25:40 +0000 (11:25 -0400)]
setup sane defaults in joy_ff_mission_init()

20 months agoclean up and simplify effects and updating
Taylor Richards [Wed, 2 Aug 2017 15:24:25 +0000 (11:24 -0400)]
clean up and simplify effects and updating

20 months agofix the strength of dock and reload haptic effects
Taylor Richards [Wed, 2 Aug 2017 15:05:03 +0000 (11:05 -0400)]
fix the strength of dock and reload haptic effects

20 months agoadd rumble variant to joy_ff_explode()
Taylor Richards [Wed, 2 Aug 2017 10:29:11 +0000 (06:29 -0400)]
add rumble variant to joy_ff_explode()

20 months agomove static primary/secondary check variables to function scope
Taylor Richards [Wed, 2 Aug 2017 10:15:51 +0000 (06:15 -0400)]
move static primary/secondary check variables to function scope

20 months agoreset ff afterburn flag at start of mission
Taylor Richards [Wed, 2 Aug 2017 10:13:52 +0000 (06:13 -0400)]
reset ff afterburn flag at start of mission

20 months agoavoid updating pSpring when it isn't needed
Taylor Richards [Wed, 2 Aug 2017 10:12:06 +0000 (06:12 -0400)]
avoid updating pSpring when it isn't needed

20 months agofix the strength of afterburn haptic effect
Taylor Richards [Wed, 2 Aug 2017 06:18:50 +0000 (02:18 -0400)]
fix the strength of afterburn haptic effect

20 months agosilence annoying debug message
Taylor Richards [Tue, 1 Aug 2017 08:55:52 +0000 (04:55 -0400)]
silence annoying debug message

23 months agoadd PXO tab to launcher
Taylor Richards [Tue, 2 May 2017 11:57:14 +0000 (07:57 -0400)]
add PXO tab to launcher

23 months agoupdate PXO URLs
Taylor Richards [Tue, 2 May 2017 11:56:54 +0000 (07:56 -0400)]
update PXO URLs