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

789 Commits

Author SHA1 Message Date
Michael Martin 4f5cbef324 Upgrade internal libmikmod to 3.3.11.1. 
This should fix music playback corruption issues reported on
64-bit ARM architectures.
 2021-07-25 14:47:32 -07:00
Michael Martin c7bdd74ee6 Fix two bugs regarding stale SIS messages, from Kruzen 
When entering Hyperspace on Auto-Pilot, or are intercepted by
neutral or hostile alien ships during Auto-Pilot, the text at the
top of the screen doesn't update properly until the status
would need to change. This corrects the times when DrawSisMessage
is called to keep that up-to-date as needed.

This patch was backported from the Mega-Mod.
 2020-10-05 21:22:51 -07:00
Michael Martin 044aa342ae Update Changelog, WhatsNew, and Authors to match progress 2020-06-08 19:03:41 -07:00
Michael Martin 18dee31c4d Update and reorganize credits for 0.8.0. 
Key changes:
 - Spacing and sizing between sections is more consistent.
 - Trademark disclaimer is more universal.
 - Put many contributors from "other contributions" into "additional
   programming" or "additional artwork", as needed.
 - New credits as reflected from changelog and Precursors site.
 2020-04-26 10:46:15 -07:00
Michael Martin 39baa0af48 Spelling and punctuation pass (bug #1200) 2020-04-04 19:47:06 -07:00
Michael Martin 1e687b9392 Merge commit '7326ff096d0fc60086f2' into v0.8.0 2020-04-04 17:52:44 -07:00
Michael Martin 562917b456 Merge post-0.7.0 commits through 'c8250d8b8' into v0.7.2. 
sdl_common.c has lost some commits in the restructuring and those
will need to be replayed over the restructured files for SDL1 and 2.
 2020-04-03 17:43:49 -07:00
Michael Martin f93799fdbf Update Changelog 2019-10-02 00:03:08 -07:00
Serge van den Boom 7326ff096d Grouping ship properties together at the top of the ship .c files, from oldlaptop. 2013-11-02 21:59:56 +01:00
Serge van den Boom 15bafcbca3 Updated ChangeLog. 2013-09-29 19:08:30 +02:00
avolkov 6be6491c05 Quantum-erase GraphicsLock; Some changes needed to accomplish this: 
* comm/trackplayer Callbacks are now queued instead of asynchronously called on the stream decoder thread
* libs/callback now guards the list with a mutex (called from different threads)
* only one thread (Starcon2Main) is allowed to queue draw commands right now; a sanity check is in place (define DEBUG_DCQ_THREADS)
Fixes: Alarms and Callbacks are used for more than just Netplay, reflect this.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3761 8092fc87-c524-0410-9efc-e669fe64eaf9
 2012-02-11 23:41:06 +00:00
avolkov 8aab2ae592 Split debug key function into sync and async parts (wrt the game logic thread), paving the way for GraphicsLock and GameClock lock removal 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3759 8092fc87-c524-0410-9efc-e669fe64eaf9
 2012-01-29 20:18:50 +00:00
Meep-Eep 8abe057e2a Add/Remove fuel 10 at a time with PageUp/PageDown, from from Scott A. Colcord, Nic. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3752 8092fc87-c524-0410-9efc-e669fe64eaf9
 2012-01-28 19:02:33 +00:00
Meep-Eep d8d201ee54 Annihigate flash thread. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3750 8092fc87-c524-0410-9efc-e669fe64eaf9
 2012-01-27 23:29:03 +00:00
Meep-Eep 20e2ea337f Switch SetFlashRect() to the new flash code, as the next step towards getting rid of threads. Also some small cleanups. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3749 8092fc87-c524-0410-9efc-e669fe64eaf9
 2012-01-23 20:14:45 +00:00
Meep-Eep 85c3c334aa Some cleaning up of DoModifyShips(). More to come. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3724 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-12-31 01:39:02 +00:00
Meep-Eep 85b97fb673 Reverting. This one is not ready yet. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3723 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-12-30 01:37:21 +00:00
Meep-Eep 64ffdebd4c Changed SetFlashRect to use the new flash code. 
This is an intermediate step towards getting rid of the flash thread altogether.



git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3722 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-12-29 23:38:38 +00:00
Meep-Eep af37314aaf Added Valgrind suppression file, from Louis Delacroix 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3717 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-12-28 20:24:21 +00:00
Meep-Eep dc1dfcba27 Fix a few memory leaks, from Louis Delacroix. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3711 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-12-28 17:51:58 +00:00
Meep-Eep 5fd7d584ce Fix memory leak, from louisdx. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3709 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-12-21 18:03:45 +00:00
Meep-Eep 706dbb3cd9 Fix for a few warnings. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3708 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-12-21 17:59:49 +00:00
Meep-Eep d649de4199 Remove superfluous semicolons, from Louis Delacroix. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3706 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-12-21 17:43:44 +00:00
Meep-Eep 3d91a7cf07 Added a callback function for keys. 
Also some more comments.



git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3703 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-12-20 20:16:17 +00:00
Meep-Eep 2fdbcc6f78 Annihigate ActivateStarShip(). 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3702 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-12-16 21:01:55 +00:00
Meep-Eep 38ee94f05e Removed obsolete RESPONSE_TO_REF. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3701 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-12-16 17:30:27 +00:00
Meep-Eep cc63dda758 Don't require the 'shadow' dir in addon packs, from Alex. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3700 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-10-01 15:55:13 +00:00
Meep-Eep e2c6926c7b Make use of GAME_STATE_FILE consistently. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3697 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-10-01 14:54:18 +00:00
Meep-Eep e37fd2c51f Fixed unconst() types. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3696 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-10-01 14:15:35 +00:00
Meep-Eep 3632e6a2b5 Update 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3677 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-08-28 20:22:44 +00:00
mcmartin ee3cf76487 update ChangeLog 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3674 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-08-27 21:00:49 +00:00
avolkov c75ea6280d Various warning cleanups from Scott A. Colcord, bug #50; reworked Umgah ship code so as not to compare FRAMEs 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3667 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-08-24 16:22:39 +00:00
avolkov 35281c14c0 Refactoring of ship_death() code: Pkunk/Shofixti exception hacks removed (but not MAX_SHIP_MASS+1); both now have own death_func(); Pkunk ditty plays after a simultaneous destruction + reincarnation (bug #666); plus some comments 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3664 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-07-26 20:30:58 +00:00
Meep-Eep 8ab9c69b55 Preparing for linking with C++ code, from Scott A. Colcord. 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3663 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-07-24 19:58:25 +00:00
avolkov 3c18f2c3e7 Fixed player's phrase leading to Tanaka's solitary vigil response so that the response made sense; the new phrase is a hybrid of DOS and 3DO versions; also some emphasis punctuation changes (tracks DOS and voice actor) 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3659 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-07-20 19:02:32 +00:00
avolkov 50071c4ddc Added the Ur-Quan to the Hayes' conversation options on the Hierarchy; the encompassing option changed to 'The Hierarchy and their battle thralls'; bug #865 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3658 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-07-20 18:17:42 +00:00
avolkov fcb60bcbff Use correct Commander Hayes phrases when advising the player on the number of landers; bug #1098 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3657 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-07-20 17:23:43 +00:00
avolkov 540e92658e Preserve the remix options between visits to the setup menu; bug #1132 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3653 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-07-17 17:59:57 +00:00
avolkov 62dee51b72 Removed the remnants of the --music option; bug #1133 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3650 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-07-16 19:56:22 +00:00
avolkov f71806fb26 Fixed flagship-planet IP collision regression introduced in r3384; bug #1135 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3649 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-07-16 19:27:13 +00:00
avolkov fe51b00589 Fixed the starmap fuel range circle overflow; bug #1130; also cap the range circle at a sensible level to prevent further overflows 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3646 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-07-15 16:09:12 +00:00
avolkov c0bc500620 Added gamma correction option to the setup menu; bug #977; some work from Nic 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3645 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-07-14 21:36:36 +00:00
avolkov 9649e30f33 Refactor Melnorme comm code to make modding easier, step 1; bug #1128; from Scott A. Colcord 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3644 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-07-13 17:29:42 +00:00
avolkov 5ba6fcb8bf Added aspect ratio option to the setup menu 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3641 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-07-09 16:12:21 +00:00
avolkov a2be245a09 Added 'speech' config value which controls loading of 3dovoice addon; decoupled user option from actual presence of speech 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3637 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-07-09 02:29:10 +00:00
avolkov b7744e6459 Added the MetaChron story to the no-voice Melnorme script; bug #43 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3634 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-07-08 20:37:02 +00:00
avolkov e9e336e92c Actually build a debug exe in strict-debug mode; bug #1127; from Scott A. Colcord 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3624 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-06-24 17:38:12 +00:00
avolkov 52bf49abe3 Added spoken Slylandro probe coordinates; bug #732 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3610 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-05-15 20:45:07 +00:00
avolkov 2bdc18f95b Add the missing bits to the no-voice version of Mycon, Syreen and Utwig dialogue; correct the misspoken word 'psychically' in the no-voice Arilou version 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3607 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-05-13 19:21:24 +00:00
avolkov 227ab8ec10 Do not reset Syreen HELLO stack when discovering the vault; fixes bug #891 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3600 8092fc87-c524-0410-9efc-e669fe64eaf9
 2011-05-08 00:49:48 +00:00