Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,577 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

8577 Commits (7232b97fc855a786fa2871f23d24a6fe19ae120b)

Author SHA1 Message Date
dak180 c4ec4ffd2b 144 warnings on the wall, take some down, grind them to dust, 98 warnings on the wall. 2010-12-16 22:05:06 -05:00
dak180 0364933736 Make the xcode project work again. 2010-12-16 21:06:33 -05:00
Cyp 80ddafd0ff Use destructors instead of releaseDroid/releaseStructure/releaseFeature. 
Simplifies some stuff a bit.
 2010-12-17 02:08:18 +01:00
Cyp cd47a94318 Use new/delete when allocating droids/structures/features. 
This allows the use of constructors/destructors.
 2010-12-17 02:07:30 +01:00
Cyp 2d00cb93bd Make object inheritance hierachy explicit instead of a mixture of defines and duplication. 
Explicit casts from compatible objects to BASE_OBJECT * and SIMPLE_OBJECT * are now redundant.
 2010-12-16 23:33:19 +01:00
Cyp 3f6ecec025 Replace sqrt(x) with sqrt((double)x) to make broken compilers happy. 2010-12-16 23:28:57 +01:00
Cyp 49a85a0307 Simplify bucket3d.cpp. 2010-12-16 23:28:57 +01:00
Cyp a22d920952 Make PROJECTILE actually inherit from SIMPLE_OBJECT. 2010-12-16 23:28:56 +01:00
Cyp 12e8e5bc80 Rename *.lex.c to *.lex.cpp and *.tab.c to *.tab.cpp. 2010-12-16 23:28:56 +01:00
Cyp 0646b37603 Rename *.c to *.cpp. 2010-12-16 23:28:56 +01:00
Cyp a2cd7b0592 Make everything compile successfully with g++, without -fpermissive. 2010-12-16 23:24:40 +01:00
Cyp 2bcb709cf4 Move broken dependency hack out of most Makefile.am's, except the for the root. 2010-12-16 23:14:38 +01:00
Cyp 10c8ebdd51 Fix strict-aliasing error when compiling. 2010-12-16 23:14:38 +01:00
dak180 ab1e0c269e Add actiondef.h to the xcode project. 2010-12-16 16:32:50 -05:00
Cyp 0fe191778b Actually check the mouse position when clicking, instead of just assuming people clicked wherever the mouse moves to later. 
In theory, this should make the UI usable, even on machines that don't consistently get 10000 FPS.

Because WZ widgets are weird, just make the widgets pretend that the mouse stopped moving after clicking or releasing in a given frame.

If you click twice in the same frame, the second widget will still greedily steal the mouse click from the first widget.

Changelog: Try to improve UI responsiveness under low framerates.
 2010-12-16 22:20:09 +01:00
Cyp 477cc3385e Fix weird delivery point placement for cyborg factories and repair facilities. 
Changelog: Fixed delivery point placement for cyborg factories and repair facilities.
 2010-12-16 22:20:09 +01:00
Per Inge Mathisen 17b834b2cf Merge store enums as enums changes from cyp/cpp to master. 2010-12-16 20:02:26 +01:00
Per Inge Mathisen 0e6cb3ef93 Fix apsOilList, splitting out apsExtractorLists, and using the latter in a few places. 2010-12-15 23:25:24 +01:00
Per Inge Mathisen 0ac282eca9 Revert "Remove all traces of the utterly useless apsOilList." 
This reverts commit 71d5f82078.
 2010-12-15 22:25:52 +01:00
dak180 f945dfc029 Be sure to use the right python. 2010-12-14 01:10:43 -05:00
dak180 117e50ef20 Some times being able to see the diffs for xcode files can be useful; continue treat them as binary for merges though 2010-12-13 20:11:37 -05:00
Cyp acf2d44f59 Make order lists synchronised. 
After completing an order, droids now perform the next order in the list without network delay. Also, should fix missing orders when adding orders too fast.
 2010-12-13 21:53:44 +01:00
Cyp ba1bd6b6d6 Revert removal of loading of psStats->incenTime, since it was actually used. 
Was especially noticable in the case of plasmite bombs.

(Was part of 6bace8bdf5df6fb19df48bda4adce41704467aad.)
 2010-12-12 17:33:40 +01:00
dak180 1e6bce9594 Merge remote branch 'refs/remotes/nanotech/master' 2010-12-11 11:52:33 -05:00
cybersphinx 25ba555351 Polish translation update by Emdek. 
Closes #1347.
 2010-12-11 17:00:36 +01:00
cybersphinx 4d31e379b5 Brazilian translation update by Tucalipe. 
Closes #2387.
 2010-12-11 16:53:55 +01:00
cybersphinx dd4391990d Get rid of a few unnecessary Makefile.ams. 2010-12-11 16:41:57 +01:00
cybersphinx f378c9eb2d Move download.pl from build_tools to win32. 2010-12-11 16:21:08 +01:00
cybersphinx f5db3a4b93 Update translations. 2010-12-11 16:05:29 +01:00
cybersphinx 7a672cab30 Fix includes for generated files. 2010-12-11 15:58:39 +01:00
NanoTech 3ccc629eab Replace legacy Carbon dialogs with Cocoa NSAlerts. 
Also don't link the main binary with Carbon at all anymore.
 2010-12-10 23:39:22 -06:00
NanoTech 8dc031917f Update the libpng download url. 2010-12-10 18:29:36 -06:00
dak180 28e3d447ee Merge commit '71d5f82078c251ac75125e60b7a63931516dfea2' 2010-12-10 15:18:48 -05:00
dak180 2ee40a6f91 Update Ogg to 1.2.2. 2010-12-10 15:08:30 -05:00
Cyp 71d5f82078 Remove all traces of the utterly useless apsOilList. 
This deletion spree was inspired by the fact that the condition psStruct->type == REF_RESOURCE_EXTRACTOR can never be true for structures, since OBJ_STRUCTURE ≠ REF_RESOURCE_EXTRACTOR.
 2010-12-10 16:38:25 +01:00
buginator 6f1584d262 update .gitignore again 
refs ticket:2340
(cherry picked from commit 0a0fdadcb216ca21a6fcd95905d63a9dce6e5d1f)
 2010-12-09 22:33:02 -05:00
buginator b1495d43b6 Trap the ASCII_NEWLINE to only work in non MP games, to prevent abuse. 2010-12-09 00:52:44 -05:00
Cyp d7af165df6 Try to prevent stuttering when scrolling, by re-adding a dedicated timer just for scrolling. 
Don't ask why deltaRealTime isn't good enough for scrolling.
 2010-12-09 03:34:54 +01:00
Cyp f6867f8775 Unify the two completely different subsystems for droids picking up oil barrels and droids picking up artefacts. 
Fixes a desynch on picking up artefacts.
 2010-12-08 18:07:02 +01:00
Cyp e39b23a437 Implement syncDebugFeature, to check that features are also in synch. 2010-12-08 18:06:33 +01:00
Cyp f5893a7fe5 Don't include backtraces in syncDebug CRCs. 
This should allow using syncDebugBacktrace() without causing a desynch if some clients don't support them or print them differently.
 2010-12-08 18:00:08 +01:00
buginator 707e7d45ee Update the player list on player name change. 
fixes ticket:2338
 2010-12-07 20:19:15 -05:00
buginator c687c16ee9 Tell people they will see glitches, instead of thinking that they have selective 
color blindness for units / structures and don't have a openGL 2.0 card.
 2010-12-07 20:17:50 -05:00
buginator f38d2d9d1a Don't pass a out of range reseachIndex to prevent array corruption. 
Why it became out of range in the first place is unknown.

Closes ticket:2377
 2010-12-07 19:09:27 -05:00
Per Inge Mathisen adea03a17c semperfi: Make several global variables local. 2010-12-07 22:10:21 +01:00
Per Inge Mathisen e2d83d483d Fix AI script event not triggering on production done. Also fix lack of UI updates when AI produces something. Thanks to Cyp for infinite reviews. 2010-12-07 21:58:37 +01:00
buginator 3161d5aabf Remove float from this side of the pond. 
map_TileHeight() uses ints.
 2010-12-06 21:51:31 -05:00
buginator ac6b928ad7 Fix map preview screen redrawing, broken in f2ae61805c 
Add entries to palette.txt for the new colors used in map preview.
Draw location of oil features.

Changelog: Enhance map preview to show oil locations.
 2010-12-06 21:14:06 -05:00
buginator 33d309ce92 Clarify the the numbers below the flag are for position, not player numbers. (cherry picked from commit 2b39ab4dea0860ac3251f94c15215b6084ad5b35) 
Conflicts:

	src/multiint.c
 2010-12-06 21:14:04 -05:00
buginator fe824ed1c0 Changelog: Show tooltips for player & tech level buttons. 
We can't show tooltips on a unrelated context / form.
The side-efect of this is that if tabs are used, then the items rendered on
the first 'page' of the form don't get rendered on each addition page.
(cherry picked from commit 0c77b898c2ba0e6087099f9cc67e56755c83115c)
 2010-12-06 21:14:02 -05:00