Skip to content

Commit 404afff

Browse files
rokupsJoshEngebretson
rokups
authored and
JoshEngebretson
committed
Urho and Third Party updates (+14 squashed commits)
Squashed commits: [0adf60b] Update Delta on Android C# [f6d7cc2] Only build 64 bit iOS [7e978c5] Adjustments to build setup of atomic projects to get rid of dependency errors on windows builds. [2478856] Fix c++11 assert in EventHandler(). [54cd173] UI::GetWidgetAt() returns 0 if ui subsystem is not initialized. [6876671] Fix sdl build error on some systems. [0485d02] Urho3D -> Atomic strings [0b29649] Pick right overload when using AnimatedModel.Model property [2899b97] Update Android activity to SDL 2.0.5 [6dbf584] Updating CoreData [f57e6a3] Default IK subsystem off, readd necessary C# enum values for Box2D [172f5d9] Updates [31aec9e] [2D] Fix issue when rigid body has been deleted during event, remove unnecessary C# enum massaging [bc4f8be] Urho and Third Party updates (+5 squashed commits) Squashed commits: [9da0435] SDL 2.0.5 update, macOS building running [5d87733] Fix directx build errors [50a7a5a] Prevents newly subscribed handlers from executing on very this frame. Fixes E_KEYUP causing FeatureSamples to exit instead of returning to menu. [5d60c4c] Script binding generation adjustments [c449f18] Sync with upstream 129205a
1 parent c0a700c commit 404afff

1,581 files changed

Lines changed: 70299 additions & 35468 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AUTHORS.md‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,39 +72,49 @@ Licensed under the MIT license, see [License.txt](https://github.com/urho3d/Urho
7272

7373
##Credits
7474
Urho3D development, contributions and bugfixes by:
75-
- Lasse Öörni (loorni@gmail.com, AgentC at GameDev.net)
75+
- Lasse Öörni
7676
- Wei Tjong Yao
7777
- Aster Jian
7878
- Vivienne Anthony
7979
- Colin Barrett
8080
- Erik Beran
81+
- Gauthier Billot
8182
- Loic Blot
8283
- Danny Boisvert
8384
- Sergey Bosko
85+
- Lisandro Bruzzo
8486
- Carlo Carollo
8587
- Pete Chown
8688
- Christian Clavet
8789
- Sebastian Delatorre (primitivewaste)
8890
- Josh Engebretson
91+
- Simon Flores
92+
- Manuel Freiberger
8993
- Chris Friesen
9094
- Alex Fuller
9195
- Henrik Heino
9296
- Mika Heinonen
97+
- Victor Holt
98+
- Johnathan Jenkins
9399
- Jukka Jylänki
94100
- Graham King
95101
- Jason Kinzer
102+
- Cameron Kline
103+
- Jan Korous
96104
- Eugene Kozlov
97105
- Gunnar Kriik
98106
- Aliaksandr Kryvashein
99107
- Artem Kulyk
100108
- Rokas Kupstys
101109
- Ali Kämäräinen
102110
- Pete Leigh
111+
- Arnis Lielturks
103112
- Frode 'Modanung' Lindeijer
104113
- Thorbjørn Lindeijer
105114
- Nathanial Lydick
106115
- Xavier Maupeu
107116
- Jonne Nauha
117+
- Huy Nguyen
108118
- Paul Noome
109119
- David Palacios
110120
- Alex Parlett
@@ -113,27 +123,35 @@ Urho3D development, contributions and bugfixes by:
113123
- Vladimir Pobedinsky
114124
- Franck Poulain
115125
- Pranjal Raihan
126+
- Mariusz Richtscheid
116127
- Nick Royer
128+
- Jonathan Sandusky
117129
- Miika Santala
118130
- Anatoly Sennov
131+
- Matan Shukry
119132
- Bengt Soderstrom
120133
- Hualin Song
121134
- James Thomas
122135
- Joshua Tippetts
136+
- Konstantin Tomashevich
123137
- Yusuf Umar
138+
- Mateus Vendramini
124139
- Daniel Wiberg
125140
- Steven Zhang
126141
- AGreatFish
127142
- BlueMagnificent
128143
- Enhex
144+
- Fastran
129145
- Firegorilla
130146
- Gordon-F
131147
- Lumak
132148
- Magic.Lixin
133149
- Mike3D
134150
- MonkeyFirst
151+
- Ner'zhul
135152
- Newb I the Newbd
136153
- OvermindDL1
154+
- PredatorMF
137155
- Scellow
138156
- Skrylar
139157
- TheComet93
@@ -149,13 +167,15 @@ Urho3D development, contributions and bugfixes by:
149167
- dragonCASTjosh
150168
- feltech
151169
- fredakilla
170+
- gleblebedev
152171
- hdunderscore
153172
- lvshiling
154173
- marynate
155174
- mightyCelu
156175
- neat3d
157176
- nemerle
158177
- ninjastone
178+
- orefkov
159179
- proller
160180
- raould
161181
- rasteron

‎Build/CMake/Modules/AtomicIOS.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set(CMAKE_OSX_SYSROOT iphoneos) # Set Base SDK to "Latest iOS"
1010
set(CMAKE_OSX_DEPLOYMENT_TARGET "")
1111
set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
1212

13-
set(CMAKE_OSX_ARCHITECTURES $(ARCHS_STANDARD_INCLUDING_64_BIT))
13+
set(CMAKE_OSX_ARCHITECTURES arm64)
1414

1515
# This is a CMake hack in order to make standard CMake check modules that use try_compile() internally work on iOS platform
1616
# The injected "flags" are not compiler flags, they are actually CMake variables meant for another CMake subprocess that builds the source file being passed in the try_compile() command
@@ -24,4 +24,4 @@ message(${IOS_SYSROOT})
2424

2525
set(CMAKE_FIND_ROOT_PATH ${IOS_SYSROOT})
2626

27-
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework AudioToolbox -framework CoreAudio -framework CoreGraphics -framework Foundation -framework OpenGLES -framework QuartzCore -framework UIKit -framework CoreMotion -framework GameController")
27+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework AudioToolbox -framework AVFoundation -framework CoreAudio -framework CoreGraphics -framework Foundation -framework OpenGLES -framework QuartzCore -framework UIKit -framework CoreMotion -framework GameController")

‎Build/CMake/Modules/AtomicMac.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ else ()
2020
endif ()
2121

2222
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof -std=gnu++11 -stdlib=libc++")
23-
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -framework AudioUnit -framework Carbon -framework Cocoa -framework CoreAudio -framework CoreVideo -framework ForceFeedback -framework IOKit -framework OpenGL -framework CoreServices -framework Security")
23+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -framework AudioToolbox -framework Carbon -framework Cocoa -framework CoreAudio -framework CoreVideo -framework ForceFeedback -framework IOKit -framework OpenGL -framework CoreServices -framework Security")

0 commit comments

Comments
 (0)