1
0
forked from 0ad/0ad
Commit Graph

13828 Commits

Author SHA1 Message Date
8f61e36352 Adds SDL2 to build-osx-libs.sh, but leave SDL1 as the default while we test, refs #2041.
Note: SDL2_CONFIG is now the variable to override the path to
sdl2-config, SDL_CONFIG remains to override the path to sdl-config

This was SVN commit r15774.
2014-09-20 19:02:24 +00:00
a8d8c6d101 Reverts the use of Set in f5336c42b8.
Sets don't support multiple elements with the same key which is required
here to fire timers multiple times per turn.
Refs #2475

This was SVN commit r15773.
2014-09-20 18:48:12 +00:00
f5336c42b8 Adds Serialization support for ES6 Maps.
Also includes the patch from Sanderd17 to use Maps and Sets for the
Timer components. Sets can't be serialized yet, but in this case they
don't require serialization.
Refs #2475

This was SVN commit r15770.
2014-09-20 17:14:53 +00:00
6b2677a3fd Adds profiles to the multiplayer lobby. Fixes #2504.
This was SVN commit r15768.
2014-09-20 15:35:26 +00:00
d62e3729d5 Improves SDL2 support, includes patch by yashi and fabio, refs #2041:
* Adds SDL color cursor implementation
* Adds config option for choosing preferred display in multimonitor
setup
* Uses text input API to better handle CJK input
* Fixes various hotkey and input bugs

SDL 1.2 is still the default and recommended, to test experimental SDL2
support, pass the --sdl2 flag to update-workspaces

This was SVN commit r15767.
2014-09-20 12:12:35 +00:00
801d13aa8b Address some possible causes of bad handling of visibility updates. Also includes a little code tweaking allowing the global update of all visibility data.
Refs #2760

This was SVN commit r15765.
2014-09-20 08:26:45 +00:00
55b12857b3 Buffs ranged units slightly as massing melee units was slightly overpowered.
This was SVN commit r15764.
2014-09-19 03:39:24 +00:00
6999295b7e Fixes #2768.
This was SVN commit r15763.
2014-09-19 03:14:46 +00:00
aa5fded9ae This was SVN commit r15762. 2014-09-17 23:22:20 +00:00
c56407a1f8 Fixes autostart init of player data, patch by mimo, fixes #2798.
Cleans up some of the autostart logic, removes and renames a few options
for clarity.
Updates readme.txt to reflect these changes and include some examples

This was SVN commit r15761.
2014-09-17 01:15:03 +00:00
b5f32e720f Rename the Briton hero Cynvelin to Cunobelin, which is a more common appellation, and is coherent with the historical data of the game. Also fix some typos by this mean.
Fixes #2639

This was SVN commit r15759.
2014-09-16 09:13:26 +00:00
809189d953 Fixes "quit" command and GUI notification for AI debugging, fixes #2755
This was SVN commit r15758.
2014-09-16 02:50:49 +00:00
b2a479cc74 reset some map attribute, addresses #2803
This was SVN commit r15757.
2014-09-15 21:59:51 +00:00
3f1db1ef01 remove aegis bot
This was SVN commit r15756.
2014-09-15 20:19:00 +00:00
66a2fe6308 Unload hotkeys on shutdown.
Fixes double registration of hotkeys on engine restart.

This was SVN commit r15755.
2014-09-15 01:27:06 +00:00
28c0b00b2e Sorts games in gamesList by status, then name. Refs #2463, #2448.
This was SVN commit r15754.
2014-09-14 22:11:03 +00:00
7b80c86645 Updates a comment forgotten in 113f72a503. Refs #2463, #2448.
This was SVN commit r15753.
2014-09-14 21:23:49 +00:00
16a99e5ad3 Fixes some untranslated text in the multiplayer lobby (map name, type, and description), refs #2547
This was SVN commit r15752.
2014-09-14 21:10:49 +00:00
113f72a503 Makes running games visible in the lobby. These will be colored in red. Refs #2463, #2448.
This was SVN commit r15751.
2014-09-14 20:59:35 +00:00
67c3a80c42 reset the trigger script when changing map, fix #2793
This was SVN commit r15750.
2014-09-14 16:52:33 +00:00
4f7a935f44 fix a rare case where a Petra attack would not know its target is already destroyed
This was SVN commit r15749.
2014-09-14 13:43:11 +00:00
0f0f4f7b03 Fixes crash on OS X if dir_watch_Poll is called during init before dir_watch_Add, refs #2427, #2650
This was SVN commit r15748.
2014-09-14 00:27:38 +00:00
0605232aaf Updated the welcome screen to inform players about the temporary removal of formations.
This was SVN commit r15747.
2014-09-13 20:34:27 +00:00
60d92b643d Fixes some unused variables in Atlas
This was SVN commit r15746.
2014-09-13 19:34:04 +00:00
01395ce96d Fixes clang warning about hidden overloaded virtual function
This was SVN commit r15745.
2014-09-13 19:06:55 +00:00
fe381158fb fix ptol_trader camel sounds, patch by thamlett
This was SVN commit r15744.
2014-09-13 17:54:40 +00:00
2acfbb04a5 fix a stupid typo, fixes #2797
This was SVN commit r15743.
2014-09-13 17:25:33 +00:00
70d81040cb Fixes Atlas copy/paste not copying actor seeds, patch by trompetin17, fixes #2791
This was SVN commit r15742.
2014-09-13 16:53:43 +00:00
ab4a1952f5 Small tweak for the options page, requesting game restart when enabling postproc effects.
This was SVN commit r15740.
2014-09-13 10:13:48 +00:00
b0c14154ee prevent a warning message of undefined variable
This was SVN commit r15739.
2014-09-13 09:57:12 +00:00
8c5470daf1 Fixes #2795. Refs #2792
This was SVN commit r15738.
2014-09-13 00:39:56 +00:00
acd86047dc Only split strings if they are non-empty. Fixes previous commit.
This was SVN commit r15737.
2014-09-12 23:11:03 +00:00
dd6b6779af trained animals in corral should not respond to alert, adresses #2792
This was SVN commit r15736.
2014-09-12 22:01:21 +00:00
134e3c84b0 Clean up some code.
Fixes linker error on OSX.

This was SVN commit r15735.
2014-09-12 21:45:30 +00:00
a8189f89e5 Stop music when resetting the simulation test mode in Atlas.
Patch by trompetin17, fixes #1712

This was SVN commit r15734.
2014-09-12 21:38:10 +00:00
83dda90662 Remove last traces of removed persian background images. Patch by dan@sstrev.com. Fixes #2777.
This was SVN commit r15733.
2014-09-12 21:14:07 +00:00
d0abd6628b Add messages.json file to the modmod. Fixes #2790.
This was SVN commit r15732.
2014-09-12 20:08:38 +00:00
87e0d9e6c1 Petra: some tunings in tech research following the merge of balance branch
This was SVN commit r15728.
2014-09-10 17:56:19 +00:00
9ba74f5b5f fix heal_barracks tech
This was SVN commit r15727.
2014-09-10 17:51:51 +00:00
e4d7586cdd Sets default compiler for OS X build to clang, using hack that should be replaced if we upgrade premake.
Fixes linking error in ICU build from build-osx-libs.sh (it was setting
the C++ compiler to clang, which is the C compiler, so it wouldn't
automatically link to the c++ lib). Now build-osx-libs.sh and the game
should use clang and whichever c++ lib is the default

This was SVN commit r15725.
2014-09-09 23:56:39 +00:00
7ada7dd2a8 Some tweaks to profiler2:
* separate the HTTP profiling server from the on-screen profiler
* allow shutting down the HTTP profiler
* print messages when enabling/disabling HTTP and GPU profilers

Patch by kingbasil, fixes #1862

This was SVN commit r15723.
2014-09-09 18:17:08 +00:00
bdd8bc1f44 update the in-game hotkeys page following 2f1d143dc2
This was SVN commit r15722.
2014-09-09 17:22:13 +00:00
fee304d789 Fixes crash from 41b98a6f12 where a VBChunk* was released but not set to NULL
This was SVN commit r15721.
2014-09-09 04:13:50 +00:00
7b3476e104 fix #2783
This was SVN commit r15720.
2014-09-08 20:37:04 +00:00
9c683af1e4 Fixes undefined property reference in Atlas after generating random map.
Fixes crash after failed random map generation in Atlas

This was SVN commit r15719.
2014-09-08 03:48:24 +00:00
881ad4090b Fixes weird unconventional use of logical not operator that also triggered a warning in clang
This was SVN commit r15717.
2014-09-08 00:19:35 +00:00
3d1cd08a4c Suppresses noisy clang/libc++ warnings from SpiderMonkey headers on OS X
This was SVN commit r15716.
2014-09-07 23:58:22 +00:00
41b98a6f12 Fixes incorrect reuse of a member variable in WaterManager, caused a crash when starting a new map in Atlas after loading a water map. Fixes #2784.
Fixes likely mem leaks from not cleaning up vertex buffer allocations

This was SVN commit r15715.
2014-09-07 23:49:24 +00:00
e027981f95 Fixes missing functions_utility_list.js in initial mod selector screen
This was SVN commit r15714.
2014-09-07 23:29:33 +00:00
13b229d503 Gameplay rebalance after a long period of testing and rebalancing. See https://github.com/scythetwirler/0ad for details on changes.
This was SVN commit r15713.
2014-09-07 21:47:26 +00:00