Two things I'd like for 82.7 #3

FLOZi · 2010-11-01T03:56:56Z

Two small commits;

One is the fix for Spring.Assign/ReplaceMouseCursor functions being LuaUI only - I'm not sure if anything else needs to be done here so it might be better left to a professional ;)

The other is a trivial little change to allow sub folders for weapondef loading, as already occurs for feature and unitdefs.

Apologies if there is anything grossly untoward with the state of my fork, git is no fun on windows :(

* ( string "soundfile" [, number volume = 1.0 [, number posx, number posy, number posz [, number speedx, number speedy, number speedz [, string "channel"] ] ] ] ) -> nil | boolean * possible values for "channel" are -- "general" (default) -- "battle" -- "unitReply" -- "userInterface"

-- as already implemented for unitdefs and featuredefs

This reverts commit b93e348.

…le to LuaRules

* new CLoadScreen CGameController * unifies the full loading stage into two files (LoadScreen.cpp + Game.cpp) * can be multithreaded so it loads the game in a 2nd thread (default off atm), while the mainthread renders the loadingscreen

- simplify how pr-downloader is started - fix memleak in pr-downloader

(hopefully) fix merge mess

* add ASSIMP support * instead of handling each polygon by its own (that's just insane with models with 1k polygons!) handle the whole piece as one object (allows many improvements reducing memory & cpu usage a lot!) * respect unit rotation * fix a va pointer usage bug * disable cullface while drawing * cast shadows

1) good practice 2) pure virtual method called terminate called without an active exception Program received signal SIGABRT, Aborted. [Switching to Thread 0x7fffe992b700 (LWP 11671)] 0x00007ffff4c12cc9 in __GI_raise (sig=sig@entry=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56 56 ../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory. (gdb) bt #0 0x00007ffff4c12cc9 in __GI_raise (sig=sig@entry=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56 #1 0x00007ffff4c160d8 in __GI_abort () at abort.c:89 #2 0x00007ffff551d535 in __gnu_cxx::__verbose_terminate_handler() () from /usr/lib/x86_64-linux-gnu/libstdc++.so.6 #3 0x00007ffff551b6d6 in ?? () from /usr/lib/x86_64-linux-gnu/libstdc++.so.6 #4 0x00007ffff551b703 in std::terminate() () from /usr/lib/x86_64-linux-gnu/libstdc++.so.6 #5 0x00007ffff551c1bf in __cxa_pure_virtual () from /usr/lib/x86_64-linux-gnu/libstdc++.so.6 #6 0x0000000000876ca1 in ThreadPool::DoTask (queue=...) at rts/System/ThreadPool.cpp:150 #7 0x0000000000876e08 in ThreadPool::WorkerLoop (id=3) at rts/System/ThreadPool.cpp:174 #8 0x00007ffff556ea60 in ?? () from /usr/lib/x86_64-linux-gnu/libstdc++.so.6 #9 0x00007ffff78bf182 in start_thread (arg=0x7fffe992b700) at pthread_create.c:312 #10 0x00007ffff4cd647d in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:111 (gdb) frame 6 #6 0x0000000000876ca1 in ThreadPool::DoTask (queue=...) at rts/System/ThreadPool.cpp:150 150 while (tg->ExecuteTask()) { (gdb) p tg $1 = (ITaskGroup *) 0x2e806c58

o/w the userdata can be parsed as arg. #3

return the currently bound buffer when udata != nil accept raw buffer id (arg #3) to bind when udata == nil

add /camtime{factor,exponent} commands parse optional factor (#3) and exponent (#4) camera state-transition parameters in Spring.SetCameraState

* New strategic icons behavior Transition from solid unit to icon is much more smooth and fluent now. Different stages of the transition are all configurable. * Oops, slightly huge mess up. * Made new way of unit icon drawing optional beside old style icons. * Icons now use all the right parameters for the size. Improved icon's transparency. * Small draw fix and tweak for non-finished and dead units.

spring#3

FLOZi added 13 commits August 29, 2010 03:28

Merge git://springrts.com/spring

0c2a2e9

Merge git://springrts.com/spring

3845b86

Merge git://springrts.com/spring

1851f22

Merge git://springrts.com/spring

13cbb18

Merge git://springrts.com/spring

04c59e1

Merge git://springrts.com/spring

4e2a919

Merge git://springrts.com/spring

68e3e7b

Merge git://springrts.com/spring

813822f

Merge git://springrts.com/spring

50c66d1

* Allow loading from subfolders for weapondef files (tdf and lua)

a10a285

-- as already implemented for unitdefs and featuredefs

Revert "* New "channel" parameter to LuaUnsyncedCtrl::PlaySoundFile"

843aa75

This reverts commit b93e348.

* Make Spring.AssignMouseCursor and Spring.ReplaceMouseCursor availab…

3df551a

…le to LuaRules

jk3064 pushed a commit that referenced this pull request May 7, 2011

compile #3

fa25a38

jk3064 pushed a commit that referenced this pull request Jun 6, 2011

attempt #3 to fix mac build

03c0f8f

hoijui added a commit that referenced this pull request Jun 18, 2011

small redesign in archive-abstraction #3: more appropriate file names

d74605a

ghost pushed a commit that referenced this pull request Jun 26, 2011

compile #3

ef3bf6d

abma added a commit that referenced this pull request Jun 29, 2011

(buildbot) try to fix "make install" #3

07c31f1

ghost pushed a commit that referenced this pull request Jul 2, 2011

typo #3

749913b

abma pushed a commit to abma/spring that referenced this pull request Jul 11, 2011

fix spring#3

4a80dd5

abma added a commit that referenced this pull request Aug 5, 2011

fix compile error #3

a73d7e9

abma added a commit to abma/spring that referenced this pull request Aug 11, 2011

compile fix spring#3

52e838e

ghost pushed a commit that referenced this pull request Oct 22, 2011

fixes (round #3)

91065c1

jk3064 pushed a commit that referenced this pull request Nov 21, 2011

fix mac compile #3

16f0b90

abma added a commit that referenced this pull request Mar 19, 2012

fix vcredist installation #3

c4590ad

abma added a commit that referenced this pull request Mar 30, 2012

fix tests-prepare.sh #3

376b00b

abma added a commit that referenced this pull request May 15, 2012

try to fix bug in luasocket on win32 #3 (compile fix)

d13f581

abma added a commit that referenced this pull request Jun 27, 2012

try to fix "dll not found" #3

ac37ee0

jk3064 pushed a commit that referenced this pull request Sep 26, 2012

debug #3

8130a58

abma added a commit that referenced this pull request Nov 13, 2012

update pr-downloader #3:

2bf69b8

- simplify how pr-downloader is started - fix memleak in pr-downloader

abma added a commit that referenced this pull request Nov 23, 2012

try to fix compile #3

9d17f9b

abma added a commit that referenced this pull request Nov 30, 2012

fix install for libgomp-1.dll #3

6bd41a4

abma added a commit that referenced this pull request Dec 2, 2012

try to fix static init errors #3

57d1432

ghost pushed a commit that referenced this pull request Dec 22, 2012

qtpfs update #3

ed68b81

abma added a commit that referenced this pull request Feb 18, 2013

buildbot: fix #3 (compress debugfiles not executables)

99b53fd

abma added a commit that referenced this pull request Mar 4, 2013

update shard #3

f27058e

abma added a commit that referenced this pull request Mar 14, 2013

fix unitsync linking #3

77eeaf7

ghost pushed a commit that referenced this pull request Mar 20, 2013

changelog #3 (...)

e00cfe8

abma added a commit that referenced this pull request Apr 9, 2013

LogOutput #3: eyecandy / language

601a6d9

abma added a commit that referenced this pull request Apr 30, 2013

travis-ci #3

f27a865

jk3064 pushed a commit that referenced this pull request Jun 25, 2013

fix #3

e0ce353

abma added a commit that referenced this pull request Aug 21, 2013

try to fix "make check" on win32 buildslave #3

8e441b1

abma added a commit that referenced this pull request Oct 7, 2013

try to fix win32 linking #3

3ba0904

abma pushed a commit that referenced this pull request Nov 19, 2013

Merge pull request #3 from abma/develop

c15c0d9

(hopefully) fix merge mess

ashdnazg added a commit that referenced this pull request Oct 18, 2017

parse arguments before pushing things on the stack

206a105

o/w the userdata can be parsed as arg. #3

ashdnazg added a commit that referenced this pull request Oct 21, 2017

parse arguments before pushing things on the stack

47f0635

o/w the userdata can be parsed as arg. #3

rtri pushed a commit that referenced this pull request Feb 14, 2018

fix qft #3

8a8db0d

gajop pushed a commit to gajop/spring that referenced this pull request Jun 30, 2018

fix qft spring#3

7ae9b64

rtri pushed a commit that referenced this pull request Feb 15, 2019

s/UnsafeSetFBO/RawBindFBO

249398b

return the currently bound buffer when udata != nil accept raw buffer id (arg #3) to bind when udata == nil

rtri pushed a commit that referenced this pull request Feb 15, 2019

s/UnsafeSetFBO/RawBindFBO

7fadb17

return the currently bound buffer when udata != nil accept raw buffer id (arg #3) to bind when udata == nil

rtri pushed a commit that referenced this pull request Nov 11, 2019

fix #6331

266b51a

add /camtime{factor,exponent} commands parse optional factor (#3) and exponent (#4) camera state-transition parameters in Spring.SetCameraState

rtri pushed a commit that referenced this pull request Nov 11, 2019

fix #6331

5308cc0

add /camtime{factor,exponent} commands parse optional factor (#3) and exponent (#4) camera state-transition parameters in Spring.SetCameraState

neoedmund pushed a commit to neoedmund/spring that referenced this pull request May 2, 2022

Prevent stackoverflow by moving pcmDecodeBuffer from stack to heap. Try

e7884f0

spring#3

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Two things I'd like for 82.7 #3

Two things I'd like for 82.7 #3

FLOZi commented Nov 1, 2010

Two things I'd like for 82.7 #3

Two things I'd like for 82.7 #3

Conversation

FLOZi commented Nov 1, 2010