gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity
17,685 Commits 1 Branch 39 Tags
e18598cd621fa29d98dd19f01f36dfdff99237e1
Commit Graph

963 Commits

Author SHA1 Message Date
elexis 1fcdc3d7f4 Deepfreeze the map settings object (created from g_GameAttributes.settings by the gamesetup extending the map JSON data) to prevent random map scripts from unintentionally modifying that, refs #4257. 
This was SVN commit r20265.
 2017-10-06 18:53:24 +00:00
elexis f1cc54cc18 Move GameView ScriptFunctions to its JS Interface, refs #4772. 
Use early returns as initialization checks.

This was SVN commit r20165.
 2017-09-11 23:03:27 +00:00
elexis 871ed04521 Move biome definitions to JSON and JS files, so that mods can easily remove or add new biomes, refs cc0d4f25da. 
Move environment biome constants from JS to JSON.

This was SVN commit r20129.
 2017-09-08 02:15:54 +00:00
elexis 1b44946078 Replace deprecated jsval with JS::Value. 
Remove unused SGUIBaseSettings and GUI comment.
Fix indentation of a macro, refs D794.

Differential Revision: https://code.wildfiregames.com/D838
Review by: leper.
Itms came up with the same patch for the SpiderMonkey 45 update
independently.

This was SVN commit r20062.
 2017-08-28 10:27:36 +00:00
leper ce580f0de0 Always delete CMapReader. Patch by Sandarac. Fixes #4154. 
This fixes an assertion failure in ScriptEngine that can occur when
closing
the game while in the loading screen.

Reviewed By: vladislavbelov, leper
Differential Revision: https://code.wildfiregames.com/D684
This was SVN commit r20035.
 2017-08-25 00:37:48 +00:00
leper 9defd11440 Pass ScriptInterface as a const ref where possible. 
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D739
This was SVN commit r20028.
 2017-08-24 00:32:42 +00:00
elexis cb18830a81 Remove CinemaManager input handler to allow user interaction on other GUI pages like message boxes and possibly few selected hotkeys. 
Disable gameview/camera hotkeys while cinematic paths are playing.

Differential Revision: https://code.wildfiregames.com/D697
Refs #3301, #3814, 89aef0b6eb
Reviewed By: Vladislav
This was SVN commit r19980.
 2017-08-12 10:32:07 +00:00
leper 00fafda955 Stop copying the territory grid when recomputing the texture. 
Before inlining territories it was changed to be a const reference, thus
avoiding the copy.

Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D741
This was SVN commit r19936.
 2017-07-30 23:37:05 +00:00
leper 98d7763765 Remove code that doesn't do anything. 
Reviewed By: Imarok
Differential Revision: https://code.wildfiregames.com/D743
This was SVN commit r19933.
 2017-07-29 23:27:28 +00:00
leper 5ab426d621 Remove commented out code. 
Reviewed By: Sandarac
Differential Revision: https://code.wildfiregames.com/D742
This was SVN commit r19932.
 2017-07-29 23:27:14 +00:00
elexis d49bf8b1bf Ensure the camera position being above the water level (without smoothing the water level with the terrain). 
Differential Revision: https://code.wildfiregames.com/D700
Fixes #3892, D229, D638

This was SVN commit r19896.
 2017-07-10 02:16:57 +00:00
elexis cfd08bbf28 Cinema Path GUI hiding and silhouettes fixes. 
Let the JS GUI take care of hiding the GUI and silhouettes and remove
the according hardcoding in the engine following 89aef0b6eb.
Thereby fix some bugs (like not having hid the GUI if there was a
message box or different page shown while playing a path) and
fix these two hotkeys broken by 5d49e6c456.

Differential Revision: https://code.wildfiregames.com/D631
Fixes #4633
Reviewed By: Vladislav
This was SVN commit r19797.
 2017-06-17 14:17:30 +00:00
Imarok b94a54b18a Use direct gui.scale instead of reciprocal gui.scale 
Patch by Dariost.

Differential Revision: https://code.wildfiregames.com/D328
This was SVN commit r19774.
 2017-06-14 17:13:44 +00:00
elexis 51f62818f7 Fix all broken checks for the absent (random-mapgen+simulation) Seed property in the engine, refs #3965. 
Hence display the originally intended useful warnings (instead of the
characterless JS "Script value conversion check failed" warning and
skipping the intended warnings).

This was SVN commit r19718.
 2017-06-02 15:07:58 +00:00
leper 25b1837603 Pass CVector3D as const reference in a few places. 
Reviewed By: Sandarac
Differential Revision: https://code.wildfiregames.com/D424
This was SVN commit r19534.
 2017-05-08 04:04:45 +00:00
leper bdfe500f98 Draw paths only when cinematics isn't playing. Patch by Vladislav. 
Also show the GUI after the cinematics stopped playing in Atlas.

Differential Revision: https://code.wildfiregames.com/D411
This was SVN commit r19533.
 2017-05-08 04:02:33 +00:00
elexis 09e974e1cb Bump year number of files changed this year in the license headers. 
This was SVN commit r19503.
 2017-05-01 14:28:22 +00:00
leper ecaa8434b1 Cinematic path node moving tool for Atlas. Patch by Vladislav. 
Differential Revision: https://code.wildfiregames.com/D369
This was SVN commit r19483.
 2017-04-30 23:47:16 +00:00
elexis 5a4cbc9261 Move CinemaManager includes forgotton in 5d49e6c456 to the right place, thus fixing the build without precompiled headers. 
Refs https://code.wildfiregames.com/D385
Reported by: leper
Fix proposed by: Vladislav
This was SVN commit r19473.
 2017-04-29 18:08:06 +00:00
elexis 5462f26aba Move CinemaPath class to the simulation helper directory, because it contains predominantly simulation data that is already serialized. 
The remaining graphics code should be moved or removed.

Differential Revision: https://code.wildfiregames.com/D324
Patch By: Vladislav
This was SVN commit r19414.
 2017-04-14 23:20:49 +00:00
elexis 2e37e6a8d9 Remove redundant path name argument from the CinemaManager AddPath function. 
Differential Revision: https://code.wildfiregames.com/D310
Patch By: Vladislav
This was SVN commit r19406.
 2017-04-11 01:37:00 +00:00
Imarok ee987d3b0d Add some consts to ShaderProgram functions 
Reviewed by: vladislavbelov
Differential Revision: https://code.wildfiregames.com/D315
This was SVN commit r19403.
 2017-04-10 15:44:33 +00:00
elexis 2f02fb4535 Move OpenGL CinemaPath rendering code to the CinemaManager, so that the remaining simulation data can be moved to the simulation directory. 
Add height indicator so that we can actually estimate the location of
the paths in atlas.

Differential Revision: https://code.wildfiregames.com/D306
Patch By: Vladislav
This was SVN commit r19394.
 2017-04-09 17:21:01 +00:00
elexis 5d49e6c456 Move most cinematic path simulation data and control from the graphics class to the simulation component and solve the hash mimatch in non-visual replay. 
Move graphics code to smaller helper functions UpdateSessionVisibility,
UpdateSilhouettesVisibility and DrawPaths.
Remove the hotkey TODO code which should be implemented differently.
Mark voids as const.

Differential Revision: https://code.wildfiregames.com/D271
Patch By: Vladislav
This was SVN commit r19375.
 2017-04-05 03:59:20 +00:00
leper 9e6571c461 Some cinema path cleanup. 
Could possibly fix a compilation failure with some compilers in
36330732fa.

Patch By: Vladislav
Differential Revision: https://code.wildfiregames.com/D250
This was SVN commit r19341.
 2017-03-24 22:49:06 +00:00
elexis 36330732fa Allow Cinematic Path nodes that only specify a camera position or direction and group them by deltatime. 
Remove the support of saving the rotation of camera position nodes,
because that should be rewritten to use a custom spline.

Patch By: Vladislav
Differential Revision: https://code.wildfiregames.com/D124
Refs #3814

This was SVN commit r19317.
 2017-03-20 15:26:34 +00:00
Imarok e7eeb6927d Remove deprecated water parameters. Patch by paulobezerr. Partial review by FeXoR. Fixes #4292. 
This was SVN commit r19040.
 2016-12-12 23:46:46 +00:00
wraitii 06333708f8 Fix animation syncronisation between actor props. Fixes #2324 one more time. Refs [18568] and [18265]. Reported by 
wowgetoffyourcellphone

This was SVN commit r19031.
 2016-12-08 23:16:54 +00:00
elexis 808dd347b6 Play cinematic paths on arbitrary cameras to prepare previews of the camera frustum in atlas. Patch by Vladislav, refs #3814. 
This was SVN commit r18992.
 2016-11-23 14:50:47 +00:00
elexis 417c84870c Actually remove trailing tabs from source/. 
This was SVN commit r18991.
 2016-11-23 14:09:58 +00:00
elexis 6149dd3841 Actually remove trailing whitespace for non-header files as well. 
This was SVN commit r18989.
 2016-11-23 13:02:58 +00:00
elexis b18f74da44 Remove trailing whitespace and whitespace in empty lines of source/ except source/third_party/. 
This was SVN commit r18987.
 2016-11-23 11:18:37 +00:00
Itms 0cc23c1964 SpiderMonkey 38 upgrade: 33/35 
Remove a workaround. Note that this removal is incomplete. Based on
patch by leper.

This was SVN commit r18687.
 2016-09-02 16:53:22 +00:00
leper 4ed7d6c202 Fix compilation failure. 
This was SVN commit r18621.
 2016-08-21 20:35:10 +00:00
Itms 4e87fef3da The old debug API has been removed in SpiderMonkey 38, so remove profiler1 script profiling. 
Patch by leper, refs #3708

See also https://bugzilla.mozilla.org/show_bug.cgi?id=1069694

This was SVN commit r18580.
 2016-08-02 16:58:30 +00:00
sanderd17 51eb4b255c Don't let the props inherit the 'idle' animation if the parent doesn't have the needed animation. Fixes #4071 
This was SVN commit r18568.
 2016-07-29 11:57:27 +00:00
wraitii 7c21a0cf8e Header cleanup: profile.h is no longer unnecessarily included in scriptinterface.h but rather in the required .cpp files 
This was SVN commit r18417.
 2016-06-21 10:33:11 +00:00
sanderd17 450973a624 Clean up some code-style issues reported by leper 
This was SVN commit r18390.
 2016-06-16 14:51:12 +00:00
sanderd17 ff886b1773 Try to fix issue with probably uninitialised animation frequency, improve error message and clean up code a bit 
This was SVN commit r18278.
 2016-06-01 07:21:50 +00:00
sanderd17 b18c4ac217 Code style improvements to df971c3885 
This was SVN commit r18267.
 2016-05-30 17:05:39 +00:00
sanderd17 83af69286d Allow simulation to set the actor variant selection, and use it for the garrison flag. Fixes #3952 Refs #2679, #3983 
This was SVN commit r18266.
 2016-05-30 14:07:48 +00:00
sanderd17 df971c3885 Allow to give a frequency to animations, and allow to sync randomly selected animations on base model and prop. Fixes #2324 
This was SVN commit r18265.
 2016-05-30 11:53:19 +00:00
elexis 9cc98aaf47 Take new observermode into account in some missing places, refs #3850, #3168. 
This was SVN commit r18223.
 2016-05-23 15:26:47 +00:00
sanderd17 8311472a5c Change include into forward declaration 
This was SVN commit r18063.
 2016-04-19 17:48:06 +00:00
sanderd17 1e6c12de7b Allow variants to be defined in external files. Fixes #3286 
This was SVN commit r18054.
 2016-04-19 07:51:59 +00:00
sanderd17 df3c3c35b2 Cleanup cinema code. Fix some issues with resetting of times. Patch by Vladislav. Refs #3814 
This was SVN commit r18041.
 2016-04-17 15:43:29 +00:00
sanderd17 22bbe450e4 Move some methods out of the headers. Patch by Vladislav. Refs #3814 
This was SVN commit r18000.
 2016-04-07 17:47:30 +00:00
sanderd17 2a11d3ca7b Interpolate cinematic camera rotation + allow more points in cinematic path + add comments. Patch by Vladislav. Refs #3814 
This was SVN commit r17975.
 2016-04-04 20:31:18 +00:00
elexis c3ac6cf7fc Save target-nodes (lookAt-coordinates) for cinematic-camera paths. Patch by Vladislav, refs #3301. 
This was SVN commit r17763.
 2016-02-15 17:18:59 +00:00
elexis a2f7d4d82a Show fog of war in observermode, fixes #3168. 
This was SVN commit r17735.
 2016-02-06 12:56:41 +00:00