adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,014 Commits 1 Branch 0 Tags
master
Commit Graph

2582 Commits

Author SHA1 Message Date
mcmartin 6fa3426157 Added a "None" gesture for cleaner reporting of blank/erroneous controls 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2686 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-30 05:54:30 +00:00
mcmartin 882e9354d6 Removed the unnecessary VControl abstraction layer. 
VControl already directly depends on other UQM libraries, so this buys 
nothing.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2685 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-30 02:36:36 +00:00
Meep-Eep 68aa444425 Fix compilation without Netplay support. (Was fixed in CVS, but after 
we moved to SVN).


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2684 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-28 13:15:39 +00:00
avolkov 6198fc0f90 Removed a piece of leftover test code 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2682 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-28 03:24:09 +00:00
avolkov f2bcedbca1 Added AIFF decoder 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2680 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-28 03:19:55 +00:00
Meep-Eep dcb277a505 Log messages cleanup; one extra message. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2677 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-19 18:44:51 +00:00
avolkov 5e055e5003 Bugfix for #734 + small cleanup 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2676 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-19 06:48:06 +00:00
mcmartin d54345bf94 Menu-Cancel will now quit out of the Manifest Menu (Bug #838) 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2675 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-19 05:48:14 +00:00
mcmartin 7da89e82ab Added commandline and installer options for "Safe Mode" startup 
(See Bug #946 for more details.)


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2673 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-19 03:44:39 +00:00
mcmartin 16122a71da Rely on surface pitch instead of screenwidth in OpenGL mode (Bug #956) 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2672 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-18 08:45:17 +00:00
avolkov 1e68d8f721 Updated copyright ending year in win32 version infoUrQuanMasters.rc 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2671 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-15 19:27:38 +00:00
mcmartin a7e9b5094d Micro version bump 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2669 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-14 23:04:49 +00:00
mcmartin d478a0b56d Missed an #include required by gcc. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2668 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-14 22:38:11 +00:00
Meep-Eep d1f2d6c118 A bit more debug info for failed connects. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2667 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-14 14:11:14 +00:00
mcmartin 312cb8bcea Froperly exit with failure if the content directory is found but the kernel data is not. 
This is necessary for the error messages to be visible in Windows.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2663 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-14 03:38:27 +00:00
mcmartin 0b8f5a36d2 F1 and F10 finally immune to crossfades (Bug #455) - Michael 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2662 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-13 07:57:17 +00:00
mcmartin a82bcf1338 Removed executable flags from a ridiculous number of non-executable files. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2661 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-13 07:03:15 +00:00
mcmartin 0b4813534e D'oh; missed a check in previous patch 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2660 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-13 01:37:15 +00:00
mcmartin 1cee0aa1e8 No longer depend on SDLK_LAST statically. 
Key input should now be safe even if compiled with a different version 
of SDL than the one running the program (Bug #936, possibly also #883)


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2659 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-13 01:35:05 +00:00
Meep-Eep 8105e86155 Flush the stream when doing a uio_close() after a uio_fwrite(). 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2655 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-11 22:04:14 +00:00
mcmartin 43eb06dd28 Major rewrite of SwapBuffers routines. 
This rewrite abstracts out all screen compositing code into sdl_common.c 
and treats pure and OpenGL modes as backends.  This should make fixing 
compositor bugs easier in the future, as well as providing alternate 
rendering forms for weaker cards if necessary.



git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2653 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-11 00:45:48 +00:00
avolkov f8670f22ed VC6 does not allow ptr arithmetic on void*; casting pixels to Uint32* for cleaner ptr arith 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2651 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-09 07:58:22 +00:00
mcmartin b13ef94ab4 Micro version bump to 0.6.1. 
This isn't the final update (doc/versions and the NSIS scripts still 
need updating) but this is likely the last change to the source code 
itself for 0.6.1.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2649 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-09 02:35:37 +00:00
mcmartin c3473a12ac Exclude Private Area from isWideGraphChar. 
This is a stopgap fix for Bug #942.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2648 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-09 01:22:26 +00:00
mcmartin 85b0e97626 Do not rely on GL_UNPACK_SKIP_* attributes, as not all OpenGL drivers 
support them right (Bug #914) - Michael


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2647 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-09 00:58:29 +00:00
mcmartin 83915976bd Do not overwrite GLOBAL_SIS (CrewEnlisted) when leaving HyperSpace. 
This fixes bug #938.  Entering combat while *in* HyperSpace appears to 
still update crew counts appropriately.



git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2646 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-08 02:26:13 +00:00
mcmartin 6e208cc4db Fixed a text entry width problem that was nuking control template names 
(Fixes Bug #947)


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2643 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-06 00:33:13 +00:00
Meep-Eep a97570fc8c / placement 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2642 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-04 07:56:09 +00:00
Meep-Eep cba93f7fce uio cleanups, documentation 
path fixes, improvements
Fixes bugs 738, 907


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2641 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-03 16:58:59 +00:00
Meep-Eep a7b19f9f0d Sanity check for loaded teams. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2640 8092fc87-c524-0410-9efc-e669fe64eaf9
 2007-01-01 16:01:36 +00:00
Meep-Eep bf50240944 Cleanups, documentation. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2639 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-31 13:22:16 +00:00
Meep-Eep 28cdc3c777 Added NetDescriptor_detach() 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2638 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-30 13:03:55 +00:00
Meep-Eep 6dcf79e1df NETPLAY_LISTEN_BACKLOG definition 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2637 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-30 13:03:03 +00:00
Meep-Eep a70913b70b Whitespace fix. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2636 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-28 16:39:44 +00:00
Meep-Eep a3f7a022bb Fix uninitialised structure fields. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2635 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-28 16:11:34 +00:00
Meep-Eep 0a1e758445 Removed duplicate declaration. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2634 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-28 15:54:44 +00:00
Meep-Eep 97626d2ab5 Simplification of uio Stream functions. No more internal seeks. 
Taking advantage of the POSIX/SUSv2/C requirement that input and output
operations may not immediately follow eachother.



git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2631 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-20 20:15:43 +00:00
Meep-Eep 9d33198ba3 Fixed a bug where an input delay was used for non-network games. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2626 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-19 00:23:42 +00:00
Meep-Eep fb387f259d Fixed a bug where the victory ditty would end prematurely when UQM is compiled without Netplay support. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2625 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-19 00:22:44 +00:00
mcmartin eb1c4755a2 Notify the remote side when a ship is deleted from the fleet by pressing 
the CANCEL button from the 'pick a ship' dialog.  From Meep-Eep.



git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2623 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-17 06:28:22 +00:00
mcmartin 32af029253 Produce proper SVN properties for content files post-conversion. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2621 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-17 06:09:42 +00:00
mcmartin f3e8b1bb0f Version bump to 0.6.0 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2616 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-16 04:47:43 +00:00
meep-eep 7825af34ef Output Netplay version on startup. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2613 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-15 06:31:57 +00:00
meep-eep 580f853328 Prevent network games with a computer controlled player, and a decent error 
when trying a network game with two network players.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2612 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-15 05:11:06 +00:00
mcmartin fe2df30400 Change default Player 2 config 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2611 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-15 05:08:50 +00:00
meep-eep e922d36f77 Third argument to fcntl with F_SETFL should be an int anyhow. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2602 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-15 00:31:58 +00:00
meep-eep fcd4d7ff78 Using fcntl() with F_SETF to set non-blocking mode, instead of 
ioctl() with FIONBIO. This is the POSIX way.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2601 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-15 00:27:21 +00:00
meep-eep e5759825f1 Setting default delay to 2. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2600 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-15 00:22:06 +00:00
meep-eep 3de750ecb8 Only build libs/network if netplay is enabled. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2598 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-14 23:46:22 +00:00
meep-eep 6158344d9a Fix PlayerControl bug. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2588 8092fc87-c524-0410-9efc-e669fe64eaf9
 2006-12-08 03:23:22 +00:00