Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
7,340 Commits 8 Branches 28 Tags 13 GiB
94aee121fd
Commit Graph

7340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
WhiteTreePaladin
7d26b8eefd Roman civ sprite 
This was SVN commit r8561.
 2010-11-08 23:52:44 +00:00
Mythos_Ruler
c03c2f0168 Fixed hoplite prop switching (heads) when gathering meat. 
Tweaked maps.
New "Bog" map, w.i.p.
Tweaked ship health.

This was SVN commit r8560.
 2010-11-08 23:40:45 +00:00
WhiteTreePaladin
dde2cd38be Show Population Cost in unit training buttons 
Show Population Bonus in unit construction buttons

This was SVN commit r8559.
 2010-11-08 23:23:52 +00:00
janwas
6e74c53ee9 fix file/dir mode bits 
fixes #648
also fix self-test on ICC 12

This was SVN commit r8558.
 2010-11-08 15:02:05 +00:00
WhiteTreePaladin
0517d41275 Removed extraneous cancel button from multiplayer setup dialogs 
Adjusted the right side of the bottom panel in the session GUI
Renamed "dev console" to "dev overlay" in the chat message to be more
consistent

This was SVN commit r8557.
 2010-11-08 14:49:40 +00:00
janwas
6935a03743 remove no-longer needed GLU dependency; avoids delay-load warning. 
This was SVN commit r8555.
 2010-11-08 10:42:34 +00:00
janwas
24f1a00190 avoid setting executable bit in files/dirs we create 
thanks to fabio for reporting + a suggested fix.
fixes #648

This was SVN commit r8554.
 2010-11-08 10:39:52 +00:00
janwas
6b4d5091b3 fixes from work: use ICC bswap intrinsics instead of fallbacks; update UNUSED2 to work with ICC; update mahaf for Win7 
This was SVN commit r8553.
 2010-11-08 10:01:12 +00:00
Mythos_Ruler
9c53fda749 Misc. art stuff. 
This was SVN commit r8552.
 2010-11-08 00:36:34 +00:00
Mythos_Ruler
85fc7cae52 Cleaning up the props. 
This was SVN commit r8551.
 2010-11-08 00:23:06 +00:00
Mythos_Ruler
323cda17c3 cleaning 
This was SVN commit r8550.
 2010-11-07 23:57:04 +00:00
Mythos_Ruler
ffa6c14a24 More cleaning. 
This was SVN commit r8549.
 2010-11-07 23:51:46 +00:00
Mythos_Ruler
a7059092cb cleaning 
This was SVN commit r8548.
 2010-11-07 23:40:48 +00:00
Mythos_Ruler
dafc0e6dbd This was SVN commit r8547. 2010-11-07 23:32:02 +00:00
Ykkrosh
e43eb0c18b # Various hotkey fixes and cleanups. 
Support ctrl for removing entities from selection.
Move big screenshot hotkey to shift+F2.
Increase mouse wheel rotation speed.
Fix HotkeyIsPressed when a more specific hotkey was matched instead.
Support multiple hotkeys with the same binding.
Use hotkeys instead of raw key events in GUI.
Delete some obsolete hotkey definitions.
Remove unused broken EntitySelection toggle method.

This was SVN commit r8546.
 2010-11-07 20:42:52 +00:00
janwas
a13836bd68 safely handle zero-sized XMB files ensuing from a crash while loading 
fixes #662

This was SVN commit r8545.
 2010-11-07 16:14:13 +00:00
Ykkrosh
644b9aedea # Add double-click and triple-click selection modes, based on patch by Christoph and evans. 
Fixes #515.

This was SVN commit r8544.
 2010-11-07 00:12:55 +00:00
janwas
f45c74c368 thread-safety fixes to debug.cpp - most functions were already reentrant, just CAS-ified the assert suppression flags. 
(NB: the debug_filter stuff remains non-reentrant because it's usually
only called from main() or at least the main thread)
closes #654

This was SVN commit r8543.
 2010-11-06 19:14:16 +00:00
janwas
3407983e98 remove no-longer needed (and non-reentrant) MICROLOG as per today's meeting 
This was SVN commit r8542.
 2010-11-06 19:11:40 +00:00
Mythos_Ruler
b4d6ad9f0b Template fixes and tweaks. Gave ships larger Health bars. Fixed some range things with ranged units. 
This was SVN commit r8541.
 2010-11-06 18:45:42 +00:00
Mythos_Ruler
43665f09c5 Fixed some template stuff. 
This was SVN commit r8540.
 2010-11-06 17:52:30 +00:00
WhiteTreePaladin
741477926c Make the minimap fit completely inside the border when in circular mode (to prevent units from sneaking around behind the rim) 
This was SVN commit r8539.
 2010-11-06 02:13:40 +00:00
WhiteTreePaladin
e7b5f9eeb9 Allow up to 24 construction or training buttons 
Add tooltip of generic name back to the unit name
Move civ name to player name tooltip
Make player name colored with the player color again

This was SVN commit r8538.
 2010-11-06 01:55:29 +00:00
Mythos_Ruler
c1daf9a9bc This was SVN commit r8537. 2010-11-05 13:22:06 +00:00
Mythos_Ruler
4f4c19be85 new portraits 
This was SVN commit r8536.
 2010-11-05 13:17:30 +00:00
Mythos_Ruler
c2bafa78cb A bunch of stuff. 
This was SVN commit r8535.
 2010-11-04 23:51:42 +00:00
historic_bruno
dbcd004844 Fix player assignments on map change (number of players may decrease, knocking assigned players out of a slot). Fixes #655 
This was SVN commit r8534.
 2010-11-04 20:34:29 +00:00
Mythos_Ruler
4a9ae1de17 Touched up Hellenised Egypt and Massacre of Delphi. Overhaul and completion of 'Median Oasis.' -- Check it out! 
This was SVN commit r8533.
 2010-11-04 20:30:13 +00:00
Mythos_Ruler
31f263d688 This was SVN commit r8532. 2010-11-04 01:07:00 +00:00
Mythos_Ruler
b3f2363c2d Altered the "generic name" of the Cretan Archer from "Infantry Archer" to "Mercenary Infantry Archer" to emphasize the reason they cost only Metal. 
This was SVN commit r8531.
 2010-11-04 01:06:00 +00:00
Mythos_Ruler
3ebbd8a9ce tweaks on these buildings to make them buildable under certain circumstances. 
This was SVN commit r8530.
 2010-11-04 00:53:15 +00:00
Mythos_Ruler
0b48fc0484 Added costs to these buildings. 
This was SVN commit r8529.
 2010-11-03 23:42:41 +00:00
Ykkrosh
818ea52c3b Delete obsolete non-working i18n code 
This was SVN commit r8527.
 2010-11-03 17:52:07 +00:00
Ykkrosh
ec5d4a9f9e Attempt to fix build error with intrinsics on 32-bit Linux 
This was SVN commit r8526.
 2010-11-03 02:06:38 +00:00
Ykkrosh
81f5e0ac5f Allow continuing playing when a client leaves a multiplayer game (fixes #620). 
Fix multiplayer autostart.
Make NETTURN_LOG syntax differently ugly.

This was SVN commit r8525.
 2010-11-03 00:21:52 +00:00
Mythos_Ruler
786279fb95 New minimap circle. 
This was SVN commit r8524.
 2010-11-02 17:08:50 +00:00
Mythos_Ruler
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
Mythos_Ruler
947ce01f68 Got rid of the whale entities giving an error. 
This was SVN commit r8522.
 2010-11-02 16:21:51 +00:00
janwas
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
Ykkrosh
540925aa32 Add a rubbish experimental FPS camera view 
This was SVN commit r8520.
 2010-11-01 21:40:29 +00:00
Mythos_Ruler
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
Mythos_Ruler
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
janwas
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
janwas
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
janwas
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
janwas
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
Ykkrosh
aefc87f226 Windows fixes 
This was SVN commit r8513.
 2010-10-31 22:26:41 +00:00
Ykkrosh
602b99c397 Fix water rendering in "reveal map" mode. 
This was SVN commit r8512.
 2010-10-31 22:07:57 +00:00
Ykkrosh
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
Ykkrosh
034504f536 Remove misleading wposix declaration of unimplemented gettimeofday. 
This was SVN commit r8510.
 2010-10-31 21:58:30 +00:00