f0f50ec402
Aul: Don't prepend "ERROR:" to parser error msgs
...
Further formatting of the error message should be the error handler's
job.
2016-10-31 11:16:14 +01:00
3c13c88f56
Aul: Count errors and warnings properly
...
9caaf1e
2016-10-31 11:15:19 +01:00
5c5e1a5fa3
Fix editor selection after object duplication on remote clients
...
Also remove some remaining EditCursorSelection/EditCursorDeselection callbacks
2016-10-30 22:26:14 -04:00
97c8104ac8
Fix msvc build.
2016-10-30 21:46:29 -04:00
15fbb1ea99
Fix editor runtime join to use a file at the temporary path
2016-10-30 20:40:40 -04:00
55b6713185
Dedicated server: stop game when there are less than 2 clients
2016-10-30 21:36:29 +01:00
890669ea0d
Silence a warning from getopt when using --config
2016-10-30 21:36:29 +01:00
65940080a7
Remove two unused config options, set music to default off with the dedicated.
...
I admit that this is just a hack to silence some warnings by default.
2016-10-30 21:36:29 +01:00
64dd72c380
Fix dedicated: Load JPEG surfaces so the texture shape information can be correctly generated
2016-10-30 21:36:29 +01:00
63cc42e967
Improve script shader code
...
- Avoid std::list.
- Don't pass strings and vectors by value.
- Don't try to update script shader slices as they never change.
2016-10-30 12:06:01 +01:00
29b5fa5946
Fix include: no "src/"
2016-10-30 01:21:44 +02:00
13fa0ab7b1
Implement adding/removing shaders from script
...
New script functions: AddFragmentShader, RemoveShader.
There is currently no support for adding vertex shaders.
2016-10-29 21:19:08 +02:00
9ab410e47d
SDL: Notify C4Application of resolution / window size changes.
2016-10-29 14:15:09 +02:00
bce0b45413
Editor: Fix scheduler timer so it doesn't busy wait ( #1834 )
...
36/1000 is always 0 and doesn't make a lot of sense anyway. Use 1000/36
(aka 1000ms/36fps) instead so the UI thread has some time to rest.
Also use a Qt::PreciseTimer so Qt doesn't try to coalesce the scheduler
timer with other timers to save energy.
2016-10-28 21:31:14 +02:00
f2231e848e
AulCompiler: Fix static parameter type check
2016-10-24 22:00:30 -04:00
e61dcbe4c3
Extend the netpuncher: clients can ask hosts for a connection initiation to circumvent port restricted NATs
2016-10-23 22:34:43 +02:00
c2f391e565
editor: don't crash on selecting object when EditorBase doesn't have member EditorProps
...
This crash happened for me in a custom scenario but with unmodified original objects. No idea why, but it seemed defective anyway.
2016-10-23 18:47:44 +02:00
376ca5a9df
Prevent using USE_CONSOLE in lib{misc,c4script}
2016-10-22 17:42:23 +02:00
e7f4105b97
Replace duplicate BreakMessage() implementations
...
...with a single one based on std::string in the hope of getting rid of
StdStrBuf some day.
2016-10-22 17:00:20 +02:00
cada67c097
Prohibit overriding local vars with functions ( #1831 )
...
The old parser threw a standard compile error in this case; the
AST-based parser threw an ICE, which is ultimately the same thing but
made it sound like the parser was at fault. And maybe it is, and we
should allow code like "local a; func a() {}" but that seems like it
should be a conscious design decision.
2016-10-21 22:32:24 +02:00
8d2f2846b5
Fix mac build
...
Also move some stuff around once again…
2016-10-21 01:25:48 +02:00
5b7c5b48ee
Fix mape and mac build
...
Attempt #1 .
2016-10-20 20:36:52 +02:00
34a9a1de8d
Twiddle with header organization: lib{misc,c4script} do no longer include GL/glew.h
...
(Yes, it is just that complicated.)
2016-10-20 18:46:32 +02:00
e2fd7095c1
Merge branch 'ast'
...
# Conflicts:
# src/C4Include.h
# src/script/C4AulCompiler.cpp
# src/script/C4AulParse.cpp
# src/script/C4AulParse.h
# src/script/C4ScriptHost.cpp
# src/script/C4ScriptHost.h
# tests/CMakeLists.txt
2016-10-20 17:33:02 +02:00
266feeda4d
Aul: Add AST generation tests
...
Just making sure the parser creates the AST the way we expect before we
hand off the code to the codegen.
2016-10-20 17:20:55 +02:00
118961d0b7
Aul: fix octal escape parsing
...
Bet you didn't know C4Script supported octal escapes inside strings.
Well, it didn't; or at least not correctly.
2016-10-20 16:53:23 +02:00
5915f79960
Don't entirely recreate global vars in second compile pass
...
This allows people to properly cross-reference two proplists from each
proplist's initializer.
2016-10-19 14:20:48 +02:00
021a6e89f5
Implement direct execution of whole function definitions
...
This implements the changes made in c6e4bfd
2016-10-19 14:20:47 +02:00
1a8db9e109
Make C4ScriptHost store C4Value refs to owned functions
...
C4Value already handles refcounting properly for us, so we don't need to
do it manually. It might still be worth manually refcounting them
to avoid the boxing/unboxing overhead, but it's only needed at load and
unload so it's not a priority at the moment.
2016-10-19 14:20:46 +02:00
5f3dbdd417
Reject function expressions inside proplists inside functions
...
These aren't supported by the codegen on account of not working in
savegames.
2016-10-19 14:20:45 +02:00
9caaf1e298
Aul: Split out error handling into a separate class for easier testing
...
By using an extern error handler in the script engine, we can mock that
handler and make sure something that should fail actually does, instead
of having to parse log messages.
2016-10-19 14:20:41 +02:00
b2d5164a0f
Remove re namespace alias
...
This alias is a legacy from when we were using Boost.Regexp to
workaround a broken implementation in GCC's libstdc++ earlier than 4.9.
2016-10-19 13:46:03 +02:00
a188500609
Remove MS CRT memory management debugging
...
Redefining new breaks perfectly valid code, but only on MSVC and only in
one particular configuration (Debug). This is very annoying because it
means people not using MSVC, or even people doing Release builds, can
write standards-conforming code which then may fail to build for other
people.
2016-10-19 13:46:01 +02:00
f7a04624eb
Remove references to functions defined in unloading defs ( #1776 )
2016-10-19 13:45:59 +02:00
ab1e6bd5a4
Allow proplist-local funcs to access vars of their owner's prototype
...
Thanks to JCaesar for providing this test case.
2016-10-19 13:45:35 +02:00
1b32633806
Add C4LangStringTable::system_string_table def'n to standalone stubs
2016-10-16 20:11:13 +02:00
2362a73e60
FnSetSky: open Graphics.ocg before re-loading sky ( #1827 )
...
Needed to load shader slices in C4Sky::Init.
2016-10-16 10:04:54 -07:00
8f61918219
Initialize graphics when re-loading sky ( #1827 )
...
Need this so that C4Sky::Init can read the shaders.
2016-10-16 10:04:54 -07:00
8f47edc1e3
Fix destruction order of system string table vs. editor
...
Depending on the mood of the linker, the editor may have been
constructed before and destroyed after the system-wide string table
because they weren't defined in the same file. Destruction of the editor
tries to load some strings, which would then access the already
destroyed string table and thus crash.
2016-10-16 18:40:51 +02:00
24c386c67f
Editor: Fix recent scenario display on welcome page if a recent entry was opened via path including Scenario.txt
...
Always show the name of the enclosing .ocs file.
2016-10-16 09:52:48 -04:00
cd9d6f5c6f
Editor: Show full path name in sound delegate display string
2016-10-16 01:15:38 -04:00
38cf275de7
Editor: Implement saving of editable enum delegates
2016-10-16 01:12:21 -04:00
386f178568
Editor: Auto-focus enum child editors for int, string, color and any types
2016-10-15 18:26:03 -04:00
028b576ab3
Editor: Change initial tool to "object edit"
2016-10-15 11:43:55 -04:00
c44a776090
Editor: Fix object list update on object removal
2016-10-15 11:43:12 -04:00
978afbc4a2
Editor: Focus object script box on double-clicking item in object list
2016-10-15 10:39:33 -04:00
d24afbe835
Editor: Fix display of non-object properties
...
Fixes property display of definitions, Global and Scenario.
2016-10-15 10:06:44 -04:00
06a438e05e
Editor object list: Remove effects; add Global and Scenario
2016-10-15 10:06:44 -04:00
4b3f8c0fef
Remove EditCursorSelection and EditCursorDeselection callbacks
...
They never worked properly in network mode because all users would see the changes.
EditorProps, EditorActions and shape delegates now provide the functionality to have custom object editing widgets.
This also fixes a bug with the selection callback causing the object list to act up.
2016-10-15 10:06:43 -04:00
59b5525a41
Rework sky definition parsing
...
This also adds a broken SetSky() script function which was the main
motivation for the rework. See #1827
2016-10-15 13:34:39 +02:00
Nicolas Hake