Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity
13,122 Commits 9 Branches 28 Tags 13 GiB
0c88edc2f2
Commit Graph

5327 Commits

Author SHA1 Message Date
Yves
31e98e5c03 Reverts f25edfd8f1. Structured clones don't support cyclic references in SpiderMonkey v1.8.5. 
SpiderMonkey v24 supports it and I'll add this change to #1886 instead.

Refs #2416
Refs #2415
Refs #1886

This was SVN commit r14733.
 2014-02-06 13:32:09 +00:00
JoshuaJB
fa85527baf Send messages in queue before closing connection, patch by boeseRaupe. Fixes #2420 
This was SVN commit r14732.
 2014-02-05 02:44:25 +00:00
historic_bruno
035078c317 Disables checks in os_cpu_LargePageSize Windows implementation, since they failed on Vista SP2 with old Xeon CPU, fixes #2346 
This was SVN commit r14731.
 2014-02-04 22:30:29 +00:00
JoshuaJB
72d306873f Correctly handle the keypad enter in CInput.cpp and make the return key case catch SDLK_RETURN instead of '/r' for consistancy and readability. 
This was SVN commit r14730.
 2014-02-03 21:46:27 +00:00
historic_bruno
4be80f9322 Improves error handling in sound manager. Fixes some crashes and errors that could occur when OpenAL failed to init properly, fixes #2183, #2345 
This was SVN commit r14725.
 2014-02-02 05:58:27 +00:00
Yves
f25edfd8f1 Removes ValueCloner. 
Fixes #2416
Refs #2415
Refs #1886

This was SVN commit r14724.
 2014-02-01 20:37:33 +00:00
JoshuaJB
0157e640cc Make my last commit C++98 compatible. 
This was SVN commit r14709.
 2014-01-31 01:26:08 +00:00
JoshuaJB
ff4ed09b6f Backend for special formatting of moderaters in the lobby userlist. 
This was SVN commit r14706.
 2014-01-30 15:46:19 +00:00
Yves
bab3a08643 Fixes a crash introduced in fd187f466f by ensuring that the CScriptValRooted values are destroyed before calling JS_DestroyContext. 
I've tested the performance on Combat Demo (Huge) again with the code
from #2394.
It's very close but probably a little bit lower (hard to tell because
it's so close).

Closes #2408
Refs #2394

This was SVN commit r14705.
 2014-01-30 13:21:36 +00:00
JoshuaJB
7bcdb9f46d Remove two un-needed string initilizations from my earlier changes. 
This was SVN commit r14692.
 2014-01-27 05:46:21 +00:00
leper
78ff9a8480 Fix compilation failures with wxWidgets 3.0. Fixes #2375. 
This was SVN commit r14691.
 2014-01-27 00:02:03 +00:00
historic_bruno
0406c89908 Implements GetMonitorSize for OS X, patch by Echelon9, fixes #2390 
This was SVN commit r14690.
 2014-01-26 23:03:45 +00:00
JoshuaJB
c61badb04c Fix typo. 
This was SVN commit r14688.
 2014-01-26 19:29:21 +00:00
JoshuaJB
2a1240008c Make my previous changes < C++11 compatible. 
This was SVN commit r14687.
 2014-01-26 19:23:50 +00:00
JoshuaJB
5e70bd3628 Fix and cleanup my recent changes. 
This was SVN commit r14686.
 2014-01-26 19:01:21 +00:00
JoshuaJB
39fef5c299 Add the ability to display chat messages when joining the lobby and quickly mostly update the options window to the new UI style. 
This was SVN commit r14679.
 2014-01-26 05:39:55 +00:00
JoshuaJB
041c6ab1b3 More lobby cleanup. 
This was SVN commit r14677.
 2014-01-26 04:25:35 +00:00
historic_bruno
937ee8f77c Fixes clang "hidden overloaded virtual function" warning, patch by Echelon9, fixes #2388 
This was SVN commit r14674.
 2014-01-26 01:20:34 +00:00
JoshuaJB
41a7c78e62 Fix some stuff in XmppClient.cpp on leper's recommendation. 
This was SVN commit r14670.
 2014-01-25 20:49:48 +00:00
scythetwirler
69991cd110 Deletes extra whitespace from last commit. 
This was SVN commit r14668.
 2014-01-25 19:00:22 +00:00
scythetwirler
e183e87333 Adds a message that is triggered whenever the bot's name is mentioned when a user doesn't recognize the bot isn't human (which happens quite a lot) 
This was SVN commit r14667.
 2014-01-25 18:57:28 +00:00
JoshuaJB
12a691edc2 Make my previous changes support < C++11 and Windows. 
This was SVN commit r14661.
 2014-01-24 20:31:39 +00:00
JoshuaJB
b46a6de335 Allow using the XMPP room subject to display lobby information to user, make the lobby GUI code more readable, and cleanup the modern styles. 
This was SVN commit r14656.
 2014-01-24 18:20:15 +00:00
JoshuaJB
dd274113bc Fix #2403 
This was SVN commit r14655.
 2014-01-24 18:15:42 +00:00
scythetwirler
f94a1aeac0 Checks for game end after toggling diplomacy. Also adds a comment for clarification to the lobby bot. Refs #2402. 
This was SVN commit r14652.
 2014-01-24 00:38:08 +00:00
scythetwirler
53900c082b Added some criteria for rated games. Fixes #2402. 
This was SVN commit r14651.
 2014-01-24 00:22:50 +00:00
scythetwirler
e5e634f768 Displays ratings in the userlist. Fixes #2371. 
This was SVN commit r14650.
 2014-01-23 23:13:13 +00:00
sanderd17
fd187f466f Add vector prototype to vector-like return values from C++ to JS. Fixes #2394. 
This was SVN commit r14645.
 2014-01-23 11:32:08 +00:00
mimo
41d3366f6a check version and mods before loading a file, fixes #2361 and #2385. 
This was SVN commit r14630.
 2014-01-21 22:49:42 +00:00
JoshuaJB
29a8df5029 Change the licence of sha.h to match the licence of sha.cpp. Refs #2308 
This was SVN commit r14602.
 2014-01-18 13:12:29 +00:00
JoshuaJB
94822b791f Remove automatically generated test .cpp files. 
This was SVN commit r14596.
 2014-01-17 20:17:56 +00:00
JoshuaJB
32258b2ba3 Move lobby encryption code to third_party/encryption and add tests. Fixes #2308 
This was SVN commit r14595.
 2014-01-17 20:14:41 +00:00
Yves
377c780ddd Fixes the problem that functions in globalscripts aren't available from GUI scripts anymore since 4b1297b328. 
Refs #2241

This was SVN commit r14592.
 2014-01-17 18:21:27 +00:00
historic_bruno
c094e72ede Fixes scoping for icons in GUI text, instead of using only the top page on the stack, which caused errors when dialog boxes popped up over text containing icons 
This was SVN commit r14591.
 2014-01-17 02:54:57 +00:00
scythetwirler
c39b541714 Fixes some typoes in the bot README 
This was SVN commit r14590.
 2014-01-16 23:22:14 +00:00
wraitii
c1e86161b5 AIs now properly receive aura and technology updates. Fixes #2377, Refs #1520 . Consequently reimplement repairing for AIs. 
Fix a few style issues and a bug with the gatherer count.
Still need to fix the entity.js file to handle properly some things as
this uses raw templates values.
Cache the AIinterface in AIProxy.js, please report if this works
properly.

This was SVN commit r14588.
 2014-01-16 20:32:44 +00:00
Yves
8195e767ef Fixes an occasional crash when hotloading GUI files. 
Refs #2241

This was SVN commit r14573.
 2014-01-11 20:53:01 +00:00
sanderd17
9f243a3372 Disabling the OFFSET_LINE doesn't change any functionality as far as seen, while it fixes #2368. 
This was SVN commit r14563.
 2014-01-10 19:56:36 +00:00
Yves
cbc0650a79 Removes some unused files 
This was SVN commit r14561.
 2014-01-10 19:38:34 +00:00
wraitii
bd22432fe8 Rename common-api-v3 to common-api. 
Fix warnings with the new AI.
Fix an error with the per-player gatherer counts.

This was SVN commit r14559.
 2014-01-10 17:46:48 +00:00
mimo
ec36222b20 add more flexibility to eject units when garrisonHolder is destroyed, fixes #2242 
This was SVN commit r14550.
 2014-01-08 18:27:58 +00:00
wraitii
2d806f81f0 If at first you don't succeed… 
Refs #2359

This was SVN commit r14549.
 2014-01-08 18:18:52 +00:00
historic_bruno
7e87211d91 Attempts to fix crash reported on OS X Mavericks by not calling SDL_SetGamma in that case (this patch was included in the A15 bundles), refs #2272 
This was SVN commit r14540.
 2014-01-08 01:29:04 +00:00
wraitii
0482038af2 Another go at #2359 
This was SVN commit r14539.
 2014-01-08 00:06:26 +00:00
historic_bruno
ad6ed949ee Fixes unreferenced formal parameter warning in MSVC 
This was SVN commit r14538.
 2014-01-07 23:10:06 +00:00
sanderd17
83c5d40cfb fix compiling problem caused by 8226d75715 
This was SVN commit r14535.
 2014-01-07 14:37:02 +00:00
JoshuaJB
8226d75715 Make PickEntitiesAtPoint faster yielding 1-3% overall performance improvement. Fixes #2358. Also removes some trailing whitespace. 
This was SVN commit r14532.
 2014-01-07 04:05:10 +00:00
mimo
729a795a44 of course, 7a3b1fe47e can be simplified 
This was SVN commit r14531.
 2014-01-06 23:23:18 +00:00
mimo
7a3b1fe47e Improve speed of territory computation, fixes #2360 
This was SVN commit r14530.
 2014-01-06 22:49:57 +00:00
wraitii
d0e57cb0ff Change a few things to avoid warnings with gcc. Should fix #2359 
This was SVN commit r14529.
 2014-01-06 22:14:27 +00:00
historic_bruno
9ccaa42a54 Fixes MSVC warning C4706: assignment within conditional expression 
This was SVN commit r14519.
 2014-01-06 02:16:09 +00:00
wraitii
aa0d485d72 Fix improper disabling of waves. 
This was SVN commit r14515.
 2014-01-05 16:41:50 +00:00
wraitii
15ec863aec Substantial speed-up of the foam generation code. 
Remove waves for now as they were unsatisfactory.
Removes "shininess" as a water parameter as it was basically useless.
Add a button in Atlas to recompute water parameters so you can now see
fog in Atlas.

Fixes #1743, #1803 (invalid)
Refs #1875, #2114, #48.

This was SVN commit r14514.
 2014-01-05 16:15:20 +00:00
Yves
7193e29961 Adds precompiled.h include because Visual Studio checks for that even though the file only contains comments. 
Thanks to boeseRaupe for reporting.

Refs #2348

This was SVN commit r14512.
 2014-01-05 13:58:38 +00:00
Yves
b20955436b I completely missed the header files when disabling the JS debugger. 
Refs #2348

This was SVN commit r14511.
 2014-01-05 10:26:27 +00:00
Yves
6ca6a5f779 The patch in 4b65f77438 seems to have fixed the crash, but the initData value doesn't match the JSContext's compartment, so it's theoretically wrong. 
This should fix it correctly.

#Refs 2241

This was SVN commit r14508.
 2014-01-04 21:49:36 +00:00
Yves
4b65f77438 Fixes an occasional crash introduced in #2241 (hopefully). 
Refs #2241

This was SVN commit r14507.
 2014-01-04 21:36:12 +00:00
Yves
7d516e7e7a Disables the JS debugger. 
It's completely broken since 4b1297b328 and will have to be updated for
the new SpiderMonkey API.
I only uncomment it at the moment because I plan to fix/reimplement it
soon after the upgrade.

Closes #2348
Refs #2241
Refs #1886

This was SVN commit r14506.
 2014-01-04 20:47:56 +00:00
sanderd17
d4b2c1285c add the ability to exclude props from the selection size + add aura visualisation rings again 
This was SVN commit r14497.
 2014-01-04 10:41:32 +00:00
Yves
4b1297b328 Removes g_ScriptingHost and implements global to compartment 1 to 1 relation. 
Each GUI Page gets its own compartment and all ScriptInterfaces in the
same thread should now use the same JS Runtime.
This is required for the SpiderMonkey upgrade.
Check the ticket for details.

Closes #2241
Refs #1886
Refs #1966

This was SVN commit r14496.
 2014-01-04 10:14:53 +00:00
JoshuaJB
fb8032043b Use pointers instead of copying sprites in the GUI. Fixes #1984. Patch by jP_wanN. 
This was SVN commit r14493.
 2014-01-03 20:19:43 +00:00
JoshuaJB
b1422137e5 Cleanup GUI Checkbox C++ code by removing broken, non-obvious internal text rendering. 
This was SVN commit r14476.
 2014-01-02 03:28:15 +00:00
JoshuaJB
67570be8fa Make GUI button-based objects to behave more expectedly when doubleclicked, also some style tweaks. 
This was SVN commit r14468.
 2014-01-01 06:05:41 +00:00
JoshuaJB
1e522f9b2c Fix bug with rating in lobby bot, remove superfluous GUI typedef, and change the lobby chat autocompletion to use tab. 
This was SVN commit r14467.
 2014-01-01 00:23:18 +00:00
wraitii
9d9361ae44 Why you should test your code before committing, exhibit A. 
This was SVN commit r14466.
 2013-12-31 21:45:11 +00:00
wraitii
a7cafe75aa "Reveal all player" id back to -1, add some "ensure" to catch invalid player ids and be safer. 
This was SVN commit r14465.
 2013-12-31 21:30:48 +00:00
wraitii
fe2a97b0c9 Change some useless std::map into std::vector for LOS. Player "0" now reveals the LOS for all. 
This was SVN commit r14463.
 2013-12-31 16:38:11 +00:00
JoshuaJB
c0472f0de5 Fix trivial comment typo caught by wraitii. 
This was SVN commit r14460.
 2013-12-31 11:06:00 +00:00
JoshuaJB
c7ff0bb486 Tweak some lobby login UI bits, rework scrollbar mousewheel handling, add ability to scroll through closed dropdowns with scrollwheel, general C++ GUI cleanup, and fix broken random map script 'Unknown Nomad'. 
This was SVN commit r14458.
 2013-12-31 04:54:16 +00:00
leper
2008ebc9d6 Use ACLs in the ipstamp module to support multiple lobby bots. 
This was SVN commit r14456.
 2013-12-31 00:25:33 +00:00
JoshuaJB
e21464d960 Try to fix some errors in the bot by checking a player id's validity before using it as an index. 
This was SVN commit r14454.
 2013-12-30 20:48:15 +00:00
wraitii
dddc9bab7f Fix tests. 
This was SVN commit r14452.
 2013-12-30 18:55:37 +00:00
sanderd17
298115f4c5 Fix units chasing each other. Fixes #1537 
This was SVN commit r14449.
 2013-12-30 16:07:19 +00:00
wraitii
08b44fe647 Fix water rendering (transparent objects now appear correctly when underwater/in reflections) 
Add a new config option (renderactors) that, if set to false, will
prevent actors from rendering in-game (grass…)

This was SVN commit r14447.
 2013-12-30 15:52:42 +00:00
Yves
3362c591f5 Moves AI players to one global using the module pattern. 
This avoids wrapping overhead that would otherwise be required because
multiple globals per compartment aren't supported anymore in newer
versions of SpiderMonkey.

Check the ticket for a detailed explanation.

Closes #2322
Refs #2241
Refs #1886

This was SVN commit r14441.
 2013-12-30 10:04:59 +00:00
leper
5e23445339 Make ConfigDB properly thread-safe. 
Replace CreateValue with SetValueString so we don't pass pointers to
internal
 ConfigDB structures around. Refs #1810.
Remove some splash screen related functions since we can achieve the
same
 with the ConfigDB functions exposed to scripts.

This was SVN commit r14437.
 2013-12-29 23:56:18 +00:00
JoshuaJB
92fba32c5e Some more C++ GUI cleanup. 
This was SVN commit r14436.
 2013-12-29 20:46:02 +00:00
JoshuaJB
e729f46789 Make button-type GUI elements more responsive and cleanup in IGUIButtonBehavior.cpp 
This was SVN commit r14435.
 2013-12-29 19:31:48 +00:00
JoshuaJB
d756e8d70e Add proper licences to lobby bot files. Also remove extranious config file. 
This was SVN commit r14434.
 2013-12-29 18:46:00 +00:00
leper
3746690f82 Define GLX_MESA_query_renderer functions unconditionally. Fixes #2325. 
This was SVN commit r14432.
 2013-12-29 17:13:55 +00:00
sanderd17
bf58f04511 add wonder victory condition. Refs #1649 
This was SVN commit r14418.
 2013-12-28 13:40:39 +00:00
JoshuaJB
f254478d1b Revert accidentily committed changes. 
This was SVN commit r14415.
 2013-12-28 03:34:40 +00:00
JoshuaJB
177a7cd99d Make uninitilized players not show in the lobby leaderboard. 
This was SVN commit r14414.
 2013-12-28 03:32:31 +00:00
JoshuaJB
7688e9c93e Properly round rating calculation in the lobby bot to an integer. 
This was SVN commit r14398.
 2013-12-26 20:16:43 +00:00
JoshuaJB
4ac5aacc87 Strip some trailing spaces in the lobby bot. 
This was SVN commit r14397.
 2013-12-26 19:52:07 +00:00
JoshuaJB
ad0d81cb8a Various lobby changes and some optimizations in the lobby bot by scythetwirler. 
This was SVN commit r14396.
 2013-12-26 19:45:20 +00:00
sanderd17
9dcc3ee89e fix always picking the same processor core on some systems. Based on code hits by Philip 
This was SVN commit r14391.
 2013-12-26 10:05:44 +00:00
leper
f7e68a4d4c Bot optimizations by scythetwirler. 
This was SVN commit r14387.
 2013-12-25 15:13:58 +00:00
leper
42bc5165ab Add compile time flag to disable use of miniupnpc. 
This was SVN commit r14384.
 2013-12-18 16:08:56 +00:00
leper
c6d454ff2d Make ConfigDB threadsafe. 
This was SVN commit r14373.
 2013-12-17 19:58:39 +00:00
leper
e83f24e3a6 Move UPnP port forwarding to a thread. 
Fix some typos.
Do not return the result, as we would need to allocate it, but we never
use it.

This was SVN commit r14372.
 2013-12-17 17:03:49 +00:00
JoshuaJB
4df4c0dec0 Try to actually do the threading my previous commit said it did. 
This was SVN commit r14371.
 2013-12-17 14:57:26 +00:00
JoshuaJB
0ba25e9968 Cache UPnP root URL to try to avoid searching each time. Also make searching asyncronous with the GUI to avoid hanging. 
This was SVN commit r14370.
 2013-12-17 14:21:49 +00:00
leper
d2e671392b Fix bug in ipstamp module. 
Sync with server. Refs #2307.

This was SVN commit r14363.
 2013-12-15 18:33:01 +00:00
historic_bruno
62a10ab938 Fixes Windows build. 
Fixes UPnP error handling to be more correct and conventional, refs
#2305

This was SVN commit r14352.
 2013-12-15 01:02:26 +00:00
JoshuaJB
f890856c6d Seperate differently licenced portions of sha.cpp/h into pkcs5_pdkdf2.cpp/h and remove some extra std includes in sha.cpp. Refs #2308 
This was SVN commit r14350.
 2013-12-14 16:58:21 +00:00
JoshuaJB
bf97148ddc Add proper licence header and remove tyedefs in sha.cpp/h. Refs #2308 
This was SVN commit r14349.
 2013-12-14 16:22:48 +00:00
JoshuaJB
5876ec38d1 Make sure we properly free some UPnP-related variables. 
This was SVN commit r14348.
 2013-12-14 03:21:21 +00:00
JoshuaJB
551eb3919d Change UPnP lease duration to 0 (permanent) and update comments. 
This was SVN commit r14347.
 2013-12-14 03:03:22 +00:00
JoshuaJB
667537ee49 UPnP-based automatic port-forwarding using miniupnpc. Breaks windows build at the moment. Refs #2305 
This was SVN commit r14332.
 2013-12-13 02:23:02 +00:00