786279fb95
New minimap circle.
...
This was SVN commit r8524.
2010-11-02 17:08:50 +00:00
2186ac8e76
Tweaked blank giant map in Internal folder. Updated a few Mediterranean terrains. A Creative Commons object. A generic Gaia "field" object. Humpback Whale.
...
This was SVN commit r8523.
2010-11-02 16:26:06 +00:00
947ce01f68
Got rid of the whale entities giving an error.
...
This was SVN commit r8522.
2010-11-02 16:21:51 +00:00
383cf7b220
cleanup:
...
use intrinsics for cpu_AtomicAdd and cpu_CAS, get rid of the
corresponding assembly implementations. (wrapper functions are necessary
at work because mere declarations aren't enough to export the functions
from DLL)
also remove no longer needed fminf
This was SVN commit r8521.
2010-11-02 13:38:56 +00:00
540925aa32
Add a rubbish experimental FPS camera view
...
This was SVN commit r8520.
2010-11-01 21:40:29 +00:00
1b9f198520
Deleted the whale. It is an interesting experiment whose time has not come yet (needs some new attack code for units and possibly unitAI for attacking units).
...
This was SVN commit r8519.
2010-11-01 16:29:05 +00:00
6351102705
trying to create a 'whale' object that moves around and must be killed first (probably by warships). Then fishing boats can gather from it. I get an error though when I try to place it in Atlas. Can someone take a look at it for me? <3
...
This was SVN commit r8518.
2010-11-01 15:22:43 +00:00
52851faeb6
cleanup - remove old cpu_memcpy and cpu_i64FromDouble that are no longer needed
...
This was SVN commit r8517.
2010-11-01 11:09:03 +00:00
b27d6d38e3
thread-safe timer monotonicity check. fixes #653
...
(agree that DBL_EPSILON is an unnecessary hack, since division by
(t+eps)-(t) will yield a number not much more useful than infinity)
This was SVN commit r8516.
2010-11-01 10:19:22 +00:00
657ec9aa45
WIP timer thread safety:
...
CAS functions now implemented directly in external asm files (avoids
wrapper functions)
reinstated cpu_CAS64 (checking ARCH_IA32 at every call site is onerous)
(temporarily disable timer monotonicity check)
This was SVN commit r8515.
2010-11-01 09:54:03 +00:00
2b9774aa05
fix: alt+enter -> resize window -> maximize window failed to generate a resize event
...
This was SVN commit r8514.
2010-11-01 09:04:55 +00:00
aefc87f226
Windows fixes
...
This was SVN commit r8513.
2010-10-31 22:26:41 +00:00
602b99c397
Fix water rendering in "reveal map" mode.
...
This was SVN commit r8512.
2010-10-31 22:07:57 +00:00
5d764f1435
Run network server in a separate thread, to minimise latency.
...
Make some parts of logger and console thread-safe.
Simplify console: remove special commands; remove prefix for script
commands.
Remove LOG_ONCE, to simplify logger.
Change some code to use the new logger interface.
Fix OOS when revealing map.
Clean up some formatting.
This was SVN commit r8511.
2010-10-31 22:00:28 +00:00
034504f536
Remove misleading wposix declaration of unimplemented gettimeofday.
...
This was SVN commit r8510.
2010-10-31 21:58:30 +00:00
5b1f0b2b19
Tweaked the map description.
...
This was SVN commit r8509.
2010-10-31 18:47:51 +00:00
909d9d84cb
Work in progress--Acropolis 256 Radius map.
...
This was SVN commit r8508.
2010-10-31 18:33:02 +00:00
94a57d141a
This was SVN commit r8507.
2010-10-31 15:17:27 +00:00
491f4592a7
This was SVN commit r8506.
2010-10-31 15:00:28 +00:00
62c90b5dc4
Fix tests
...
This was SVN commit r8504.
2010-10-31 00:29:29 +00:00
a952767f48
Changed the disabled state messages for some menu buttons, they were a bit rough for a public release imho
...
This was SVN commit r8503.
2010-10-31 00:16:33 +00:00
8dc7eca77a
Autobuilder fixes
...
This was SVN commit r8502.
2010-10-30 20:39:23 +00:00
1840bb3507
Stop units walking outside the edges of circular maps.
...
Switch the GUI between square/circular minimap automatically.
This was SVN commit r8500.
2010-10-30 18:25:34 +00:00
21b0504ca5
Adding the missing player_defaults.json for #590
...
This was SVN commit r8499.
2010-10-30 18:07:31 +00:00
10c5dbcba4
Fix Atlas and autostart.
...
Fix non-POD in varargs.
Remove misleading max_players config variable (the engine doesn't care
about it, all the limits are hard-coded).
Remove civ-center-based player civ initialisation hack.
Add dummy player_defaults.json.
Clean up formatting a bit.
This was SVN commit r8498.
2010-10-30 13:27:23 +00:00
d6bf303740
Clean up line endings
...
This was SVN commit r8497.
2010-10-30 12:22:18 +00:00
5567727bd1
New maps get player data per #590 , and some minor bugfixes
...
This was SVN commit r8496.
2010-10-30 05:19:55 +00:00
22672e69d9
Info icons for #590
...
This was SVN commit r8495.
2010-10-30 04:17:01 +00:00
9ee44bd9b8
Game setup changes, including showing name, civ, team, and some options loaded from the scenarios. Civ data added. Civ info window to preview civs. Icon tooltips. Support for random map implementation. Fixes #590 .
...
This was SVN commit r8494.
2010-10-30 04:02:42 +00:00
0b978d5e26
hacked in the attack for Persian trireme too.
...
This was SVN commit r8493.
2010-10-29 22:20:20 +00:00
fcf9fbf10d
Hacked in some ship ranged attacks to play with.
...
This was SVN commit r8492.
2010-10-29 22:18:25 +00:00
97019c3a5a
Fix launching Atlas from the main menu
...
This was SVN commit r8491.
2010-10-29 21:04:59 +00:00
4f452eccde
This was SVN commit r8490.
2010-10-29 20:14:37 +00:00
4b8fcaa135
Garrisoning for ships. This is only temporary for play-testing until final garrisoning code is implemented.
...
This was SVN commit r8489.
2010-10-29 20:14:09 +00:00
70cfff0f05
started work on Median Oasis. Fixed the fact that the Celtic special building cost zero (!) resources. A "slight" oversight.
...
This was SVN commit r8488.
2010-10-29 16:55:14 +00:00
dd5ff36363
Fix Linux build error ( fixes #651 ).
...
This was SVN commit r8487.
2010-10-29 15:48:46 +00:00
0c3d69ae29
fixes from work: clarify that cpu_MemoryBarrier has no runtime cost by renaming to COMPILER_FENCE and moving to code_annotation.h; fix 32-bit Parallel Studio 2011 warning.
...
This was SVN commit r8486.
2010-10-29 12:54:51 +00:00
8f532b81cd
Fixed oasis map AGAIN. Fixed names of some units. Slave template.
...
This was SVN commit r8485.
2010-10-28 14:22:27 +00:00
825bbf8f51
parallel studio 2011 warning fixes
...
This was SVN commit r8484.
2010-10-28 12:22:11 +00:00
af235da6f4
#Updated Greek trading ship with cargo. Split up 3 dozen UI icons into their individual files. Began testing an idea discussed in the irc chat room.
...
This was SVN commit r8483.
2010-10-28 12:22:04 +00:00
12bea99ea1
Fixed some purple blobs.
...
This was SVN commit r8482.
2010-10-28 06:19:50 +00:00
c5b5fa8e6f
Fixed the purple blobs.
...
This was SVN commit r8481.
2010-10-27 20:21:47 +00:00
6576b64ce0
Cleaning up the field entities.
...
This was SVN commit r8480.
2010-10-27 11:10:34 +00:00
c6c1b2b549
This was SVN commit r8479.
2010-10-27 10:35:58 +00:00
93cd028616
Moar portrait stuff. Fixed the Persian Super Cavalry to align with the new Persian civ profile. Moved War Elephant to editor object.
...
This was SVN commit r8478.
2010-10-27 08:16:26 +00:00
7120014451
This was SVN commit r8477.
2010-10-27 06:22:29 +00:00
5db9465b25
A bunch of new portraits. The hero portraits are just temp until they are painted.
...
This was SVN commit r8476.
2010-10-27 05:49:04 +00:00
45a99a393d
New Greek merchant ship. Model is not final though.
...
This was SVN commit r8475.
2010-10-27 02:16:45 +00:00
7d7127a1bb
Scaled down the Roman Quinquereme.
...
This was SVN commit r8474.
2010-10-26 16:21:51 +00:00
728e03cee2
This was SVN commit r8473.
2010-10-26 11:34:34 +00:00
Mythos_Ruler